diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-json.xml
deleted file mode 100644
index 279f3fd51c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MA-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-xml.xml
deleted file mode 100644
index 2765d27c77..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MA-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-json.xml
deleted file mode 100644
index abae7043cf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MA-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-xml.xml
deleted file mode 100644
index 0920784309..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MA-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-json.xml
deleted file mode 100644
index 42419a70b1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MA-script3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script3-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-xml.xml
deleted file mode 100644
index 64a9d8980a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script3-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MA-script3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-json.xml
deleted file mode 100644
index 6e08439663..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MA-script4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script4-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-xml.xml
deleted file mode 100644
index b98512fc48..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script4-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MA-script4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-json.xml
deleted file mode 100644
index 9dbc800d2f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MA-script5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script5-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-xml.xml
deleted file mode 100644
index 3531308278..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script5-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MA-script5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-json.xml
deleted file mode 100644
index ceeeab2954..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-7-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-7-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 7.x - Receive MedicationData - MA-script7 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - Receive MedicationData for C XXX_Guilliamse."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script7-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script7-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario7-x-receive-meddata">
-      <name value="Scenario 7.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script7-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-xml.xml
deleted file mode 100644
index 0672aa159b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script7-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-7-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-7-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 7.x - Receive MedicationData - MA-script7 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - Receive MedicationData for C XXX_Guilliamse."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script7-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script7-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario7-x-receive-meddata">
-      <name value="Scenario 7.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script7-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-json.xml
deleted file mode 100644
index 5c2eb153ca..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-8-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-8-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 8.x - Receive MedicationData - MA-script8 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Receive MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script8-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-receive-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-xml.xml
deleted file mode 100644
index 1184638ea2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MA-script8-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-8-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-8-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 8.x - Receive MedicationData - MA-script8 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Receive MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script8-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-receive-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-json.xml
deleted file mode 100644
index c2b302ea1f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MGB-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-xml.xml
deleted file mode 100644
index 07ba35f693..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MGB-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-json.xml
deleted file mode 100644
index 6c6c41af2f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MGB-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-xml.xml
deleted file mode 100644
index 80e59db545..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MGB-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-json.xml
deleted file mode 100644
index e0e01de5e9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MGB-script3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script3-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-xml.xml
deleted file mode 100644
index c98c505f9c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MGB-script3-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MGB-script3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-json.xml
deleted file mode 100644
index 9a2c983164..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MTD-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-xml.xml
deleted file mode 100644
index 8969ee2a24..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MTD-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-json.xml
deleted file mode 100644
index 2655d178dd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MTD-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-xml.xml
deleted file mode 100644
index 6dd599fb67..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MTD-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-json.xml
deleted file mode 100644
index 5735339262..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MTD-script4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script4-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-xml.xml
deleted file mode 100644
index 051cd70f50..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script4-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MTD-script4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-json.xml
deleted file mode 100644
index b9bae828ca..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MTD-script5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script5-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-xml.xml
deleted file mode 100644
index b68bd07f52..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script5-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MTD-script5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-json.xml
deleted file mode 100644
index e090f007be..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-8-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-8-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 8.x - Receive MedicationData - MTD-script8 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Receive MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script8-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-receive-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-xml.xml
deleted file mode 100644
index 1dcba6acbe..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MTD-script8-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-8-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-8-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 8.x - Receive MedicationData - MTD-script8 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Receive MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script8-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-receive-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-json.xml
deleted file mode 100644
index c742a534ae..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MVE-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-xml.xml
deleted file mode 100644
index 4db693d5ca..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - MVE-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-json.xml
deleted file mode 100644
index 97659b711e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MVE-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-xml.xml
deleted file mode 100644
index aa59211b4b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - MVE-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-json.xml
deleted file mode 100644
index 35887cc3b9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MVE-script3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script3-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-xml.xml
deleted file mode 100644
index 9667d0995a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script3-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - MVE-script3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-json.xml
deleted file mode 100644
index f19909aae5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MVE-script4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script4-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-xml.xml
deleted file mode 100644
index 31eca6cb3e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script4-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - MVE-script4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-json.xml
deleted file mode 100644
index 586d265e11..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MVE-script5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script5-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-xml.xml
deleted file mode 100644
index f863ee420b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/MVE-script5-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - MVE-script5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-json.xml
deleted file mode 100644
index 5fa4bff853..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - TA-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-xml.xml
deleted file mode 100644
index f01bc7d36f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - TA-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-json.xml
deleted file mode 100644
index c35a067e8c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - TA-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-xml.xml
deleted file mode 100644
index 11c0004e25..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - TA-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-json.xml
deleted file mode 100644
index f4cdb2b8a4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - TA-script3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script3-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-xml.xml
deleted file mode 100644
index 40c7579bc8..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script3-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - TA-script3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-json.xml
deleted file mode 100644
index 094c0aef51..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - TA-script4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script4-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-xml.xml
deleted file mode 100644
index 46a2606dd2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script4-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - TA-script4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-json.xml
deleted file mode 100644
index 932dd93503..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - TA-script5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script5-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-xml.xml
deleted file mode 100644
index 72364f2f15..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/TA-script5-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - TA-script5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-json.xml
deleted file mode 100644
index 12bcec02a1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - VV-script1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script1-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-xml.xml
deleted file mode 100644
index b7ed8f65fa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script1-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 1.x - Receive MedicationData - VV-script1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Receive MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-receive-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-json.xml
deleted file mode 100644
index 84699cbf4e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - VV-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-xml.xml
deleted file mode 100644
index 12fb5cc47f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - VV-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-json.xml
deleted file mode 100644
index 6782db2d3b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - VV-script3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script3-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-xml.xml
deleted file mode 100644
index f65ce815c9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script3-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 3.x - Receive MedicationData - VV-script3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Receive MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-receive-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-json.xml
deleted file mode 100644
index 67a2a109fa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - VV-script4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script4-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-xml.xml
deleted file mode 100644
index d9671e78b4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script4-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 4.x - Receive MedicationData - VV-script4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Receive MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-receive-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-json.xml
deleted file mode 100644
index d818f3f469..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - VV-script5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script5-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-xml.xml
deleted file mode 100644
index ac78752104..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/VV-script5-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 5.x - Receive MedicationData - VV-script5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Receive MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-receive-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-json.xml
deleted file mode 100644
index a39c5c8947..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-json.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - WDS-script2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-WDS-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-WDS-script2-v30.json"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="json"/>
-            <contentType value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-WDS-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-xml.xml
deleted file mode 100644
index 63d5dd189d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/WDS-script2-xml.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-receive-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-receive-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Server - Scenario 2.x - Receive MedicationData - WDS-script2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Receive MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-WDS-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-WDS-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-receive-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Receive MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test server to handle a Bundle of type transaction."/>
-            <accept value="xml"/>
-            <contentType value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <requestHeader>
-               <field value="Prefer"/>
-               <value value="return=representation"/>
-            </requestHeader>
-            <sourceId value="mgsets-mp-smg-kwal-WDS-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is transaction-response."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="transaction-response"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json
deleted file mode 100644
index 6db81e6516..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Receiving-System",
-      "description" : "System that receives information from a sending system" },
-    "category" : "MedicationData",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
deleted file mode 100644
index 2e2bec24f0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - &lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="&lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationDispense and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
deleted file mode 100644
index ded41c3114..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - &lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="&lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1|MBH_300_script0_QA1_TA&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml
deleted file mode 100644
index eb94cf3552..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - &lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
deleted file mode 100644
index 12116db7a0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-1}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
deleted file mode 100644
index 27644308a0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
deleted file mode 100644
index f92493e261..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
deleted file mode 100644
index f0560c0fce..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - &lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
deleted file mode 100644
index 1c6e5b66ce..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens TA script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens TA script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
deleted file mode 100644
index ee223031e7..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
deleted file mode 100644
index 186d868f4e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens TA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens TA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
deleted file mode 100644
index 2925e4ef05..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 3.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens TA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens TA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml
deleted file mode 100644
index 5c4ca47339..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 4.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens TA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens TA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml
deleted file mode 100644
index 70c609ac7a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 5.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens TA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens TA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
deleted file mode 100644
index ac28cfb03c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml
deleted file mode 100644
index b43f84fe5b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-retrieve-9-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-retrieve-9-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Retrieve - Scenario 9.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens TA script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens TA script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 8 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 8 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json
deleted file mode 100644
index 0bee8c5d8a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "AdministrationAgreement",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
deleted file mode 100644
index 2fa512ce4b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 4 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
deleted file mode 100644
index 5189331cbc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.52711000146108.1|MBH_300_script0_QA1_VV&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml
deleted file mode 100644
index b2242693d2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
deleted file mode 100644
index 0a34aa21f1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
deleted file mode 100644
index e4a89683d0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens VV script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens VV script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
deleted file mode 100644
index eae0f9771d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
deleted file mode 100644
index 92e407a684..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens VV script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens VV script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml
deleted file mode 100644
index 5beaab555f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 3.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens VV script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens VV script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml
deleted file mode 100644
index 539e944abf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 4.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens VV script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens VV script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml
deleted file mode 100644
index c10c883709..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 5.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens VV script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens VV script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml
deleted file mode 100644
index 3eb613d464..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
deleted file mode 100644
index 395c0c9b9b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-retrieve-9-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-retrieve-9-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Retrieve - Scenario 9.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens VV script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens VV script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/properties.json
deleted file mode 100644
index b063c104ef..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "DispenseRequest",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
deleted file mode 100644
index 5acebe4548..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 12 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 12"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 15 entries. (Consists of 12 MedicationAdministration and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 15"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
deleted file mode 100644
index f95bb72bf8..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.18629005.1|MBH_300_script0_QA3_MTD4&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml
deleted file mode 100644
index be3c0d604c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|49255&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
deleted file mode 100644
index aeb814cc10..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-18}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="7"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
deleted file mode 100644
index adeadb0b74..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=le${DATE, T, D,-21}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
deleted file mode 100644
index 5a43e06ebb..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-23}&amp;effective-time=le${DATE, T, D,-11}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="7"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
deleted file mode 100644
index fda317cadc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml
deleted file mode 100644
index f3cf876dc9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MTD Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
deleted file mode 100644
index dbf0d9f054..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MTD script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml
deleted file mode 100644
index 67c7f193c1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 4.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MTD Script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml
deleted file mode 100644
index 85e76e0f4d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 5.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MTD script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
deleted file mode 100644
index 1c7e438000..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml
deleted file mode 100644
index 69b0cb14bc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-retrieve-8-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-retrieve-8-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Retrieve - Scenario 8.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MTD script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test client to retrieve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/properties.json
deleted file mode 100644
index cc6781a559..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationAdministration",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
deleted file mode 100644
index 6f8d5e17ca..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
deleted file mode 100644
index 6792eb6de9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.16076005.1|MBH_300_script0_QA1_MA&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml
deleted file mode 100644
index 51e754bb7a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
deleted file mode 100644
index e1e62cb84d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
deleted file mode 100644
index 0986b06af7..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
deleted file mode 100644
index 99d3860512..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
deleted file mode 100644
index b72492dcae..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
deleted file mode 100644
index ce3e433fe6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MA Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
deleted file mode 100644
index 7af30a5054..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
deleted file mode 100644
index 0e70644170..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
deleted file mode 100644
index cd18ede3c4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 3.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens MA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens MA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml
deleted file mode 100644
index 831488fa58..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 4.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml
deleted file mode 100644
index ebf227a6e9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 5.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
deleted file mode 100644
index c2c3f093ed..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
deleted file mode 100644
index f6197a3002..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-7-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-7-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 7.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - KWAL Medicatiegegevens MA Script 7"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-7-x">
-      <name value="Scenario 7.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 7"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900791&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml
deleted file mode 100644
index dd1baa72e2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-8-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-8-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 8.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MA script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MA script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml
deleted file mode 100644
index 2b46d3cbe9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-retrieve-9-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-retrieve-9-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 9.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens MA Script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/properties.json
deleted file mode 100644
index b75d1cef2d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationAgreement",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
deleted file mode 100644
index 11dd2390c0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle verstrekkingen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle verstrekkingen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 4 MedicationDispense and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
deleted file mode 100644
index 5ac9ae2dd9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - &lt;div&gt;Specifieke verstrekking met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MVE&#34; invoeren) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="&lt;div&gt;Specifieke verstrekking met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MVE&#34; invoeren) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.373784005.1|MBH_300_script0_QA1_MVE&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml
deleted file mode 100644
index b9131332a4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - &lt;div&gt;Verstrekkingen met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 verstrekking)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="&lt;div&gt;Verstrekkingen met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 verstrekking)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
deleted file mode 100644
index 45a4551e45..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - &lt;div&gt;Verstrekking met een filter op verstrekkingsperiode – ingangsdatum (alles vanaf T-18) (Antwoord: bericht met 2 verstrekkingen)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="&lt;div&gt;Verstrekking met een filter op verstrekkingsperiode – ingangsdatum (alles vanaf T-18) (Antwoord: bericht met 2 verstrekkingen)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-18}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
deleted file mode 100644
index dcc94ccafe..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - &lt;div&gt;Verstrekkingen met een filter op verstrekkingsperiode – einddatum (alles voor T-13) (Antwoord: bericht met 2 verstrekkingen)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="&lt;div&gt;Verstrekkingen met een filter op verstrekkingsperiode – einddatum (alles voor T-13) (Antwoord: bericht met 2 verstrekkingen)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;whenhandedover=le${DATE, T, D,-13}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
deleted file mode 100644
index f3df13c2bd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - &lt;div&gt;Verstrekkingen met een filter op verstrekkingsperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="&lt;div&gt;Verstrekkingen met een filter op verstrekkingsperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-14}&amp;whenhandedover=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="1"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
deleted file mode 100644
index 90ebce96a8..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mve-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mve-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - &lt;div&gt;Verstrekkingen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="&lt;div&gt;Verstrekkingen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 1 verstrekking)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|373784005&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
deleted file mode 100644
index 15f5b21bbd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MVE script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
deleted file mode 100644
index 05c58ad498..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens MVE Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens MVE Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
deleted file mode 100644
index ff053b05e4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MVE script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml
deleted file mode 100644
index 481ee57dab..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 3.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens MVE script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml
deleted file mode 100644
index 8697638cac..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 4.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MVE script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml
deleted file mode 100644
index e78c1c0057..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 5.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MVE script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml
deleted file mode 100644
index b89283ae8e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MVE script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
deleted file mode 100644
index bb12fa61bd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationDispense-retrieve-9-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationDispense-retrieve-9-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationDispense - Retrieve - Scenario 9.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens MVE script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens MVE script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block MedicationDispense"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|373784005&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/properties.json
deleted file mode 100644
index 8de7a96b97..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationDispense",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
deleted file mode 100644
index e3ca13a5cc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle het medicatiegebruik van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4x medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle het medicatiegebruik van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4x medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 4 MedicationStatement and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
deleted file mode 100644
index 47171a2e4d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatiegebruik met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MGB&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatiegebruik met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MGB&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.6.1|MBH_300_script0_QA1_MGB&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml
deleted file mode 100644
index 74cc30528b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatiegebruik met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatiegebruik)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatiegebruik met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatiegebruik)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
deleted file mode 100644
index 7d7d427601..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatiegebruik met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-6)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatiegebruik met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-6)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-6}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationStatement and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
deleted file mode 100644
index 4b7edf18ad..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatiegebruik met een filter op gebruiksperiode – einddatum (alles voor T-13)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatiegebruik met een filter op gebruiksperiode – einddatum (alles voor T-13)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;period-of-use=le${DATE, T, D,-13}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationStatement and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
deleted file mode 100644
index f65c5d1806..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatiegebruik met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatiegebruik met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2x medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationStatement and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
deleted file mode 100644
index 3affa0c04a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mgb-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mgb-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatiegebruik met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatiegebruik)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatiegebruik met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatiegebruik)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422979000&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
deleted file mode 100644
index 0760e74115..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 1.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MGB script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MGB script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
deleted file mode 100644
index ef5400d578..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens MGB Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens MGB Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
deleted file mode 100644
index 8e105329bf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MGB script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MGB script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml
deleted file mode 100644
index 69f5cc7aa1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 3.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens MGB script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens MGB script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
deleted file mode 100644
index be0a604ac1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MGB script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MGB script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml
deleted file mode 100644
index 7061b6f9cf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationUse-retrieve-9-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationUse-retrieve-9-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationUse - Retrieve - Scenario 9.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens MGB script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens MGB script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationStatement"/>
-            <description value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/properties.json
deleted file mode 100644
index f464193a84..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationUse",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
deleted file mode 100644
index a5c97aee60..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-1"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-1"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle WDS-en van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 WDS-en)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle WDS-en van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 WDS-en)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
deleted file mode 100644
index 87f8924ea0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-2"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-2"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke WDS met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_WDS1&#34; invoeren)&#xA;(Antwoord: bericht met 1 WDS)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.632.1|MBH_300_script0_QA3_WDS1"/>
-      <f:description value="Filter on specific MedicationAgreement identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke WDS met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_WDS1&#34; invoeren)&#xA;(Antwoord: bericht met 1 WDS)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="1"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
deleted file mode 100644
index 6567136f3a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-3"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-3"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - WDS-en met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 2 WDS-en)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="WDS-en met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 2 WDS-en)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
deleted file mode 100644
index 10dfd3e4e5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-4"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-4"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - WDS-en met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-10)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="WDS-en met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-10)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-10}&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
deleted file mode 100644
index ad60d4cd4c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-5"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-5"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - WDS-en met een filter op gebruiksperiode – einddatum (alles voor T-14)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="WDS-en met een filter op gebruiksperiode – einddatum (alles voor T-14)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;period-of-use=lt${DATE, T, D,-14}&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
deleted file mode 100644
index 34ccb4c148..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-6"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-6"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.6"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - WDS-en met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-16 tot en met T-9)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="WDS-en met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-16 tot en met T-9)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-16}&amp;period-of-use=le${DATE, T, D,-9}&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
deleted file mode 100644
index 106b8449f5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-wds-Retrieve-0-7"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-wds-Retrieve-0-7"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 0.7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - WDS-en met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3&#34; invoeren)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA3"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="WDS-en met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3&#34; invoeren)&#xA;(Antwoord: bericht met 2 WDS-en)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|395067002&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> 
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include>-->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
deleted file mode 100644
index 1921db90fb..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-VariableDosingRegimen-retrieve-10-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-VariableDosingRegimen-retrieve-10-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 10.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens WDS Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens WDS Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 3 MedicationRequest and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
deleted file mode 100644
index fe0303a59b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-VariableDosingRegimen-retrieve-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-VariableDosingRegimen-retrieve-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 2.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens WDS script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens WDS script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
deleted file mode 100644
index 866f5d412f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-VariableDosingRegimen-retrieve-6-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-VariableDosingRegimen-retrieve-6-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - VariableDosingRegimen - Retrieve - Scenario 6.x"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens WDS script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens WDS script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block VariableDosingRegimen"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Make sure that the server of the test simulator gives a success response."/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the server of the test simulator returns a Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json
deleted file mode 100644
index 537a483822..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Retrieving-System",
-      "description" : "Client that queries information from a server (Serving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "VariableDosingRegimen",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script1.xml
deleted file mode 100644
index 6e67c8a54e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script2.xml
deleted file mode 100644
index c465a8d2ed..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script3.xml
deleted file mode 100644
index 41b0f12c0e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MA-script3 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script4.xml
deleted file mode 100644
index 250aaecc3b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MA-script4 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script5.xml
deleted file mode 100644
index 2cb1978c2e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MA-script5 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script7.xml
deleted file mode 100644
index 8e30344b9c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script7.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-7-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-7-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 7.x - Send MedicationData - MA-script7 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - Send MedicationData for C XXX_Guilliamse."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario7-x-send-meddata">
-      <name value="Scenario 7.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script8.xml
deleted file mode 100644
index 5a717d41d9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MA-script8.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MA-script8 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script1.xml
deleted file mode 100644
index 710879d5fc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MGB-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script2.xml
deleted file mode 100644
index e8546e5637..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MGB-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script3.xml
deleted file mode 100644
index 9a1eafcbe2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MGB-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MGB-script3 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script1.xml
deleted file mode 100644
index c029aa0f00..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MTD-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script2.xml
deleted file mode 100644
index 81bf218a15..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MTD-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script4.xml
deleted file mode 100644
index 700682c195..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MTD-script4 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script5.xml
deleted file mode 100644
index 4496500b37..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MTD-script5 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script8.xml
deleted file mode 100644
index 395a28a8d6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MTD-script8.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MTD-script8 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script1.xml
deleted file mode 100644
index a2e48709a9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MVE-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script2.xml
deleted file mode 100644
index c0ee524e4b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MVE-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script3.xml
deleted file mode 100644
index db40798b24..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MVE-script3 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script4.xml
deleted file mode 100644
index c0e6e806f3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MVE-script4 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script5.xml
deleted file mode 100644
index 6874d1f75e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/MVE-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MVE-script5 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script1.xml
deleted file mode 100644
index b173e237f9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - TA-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script2.xml
deleted file mode 100644
index 142262faad..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - TA-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script3.xml
deleted file mode 100644
index b78a25f826..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - TA-script3 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script4.xml
deleted file mode 100644
index 3082500e79..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - TA-script4 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script5.xml
deleted file mode 100644
index e790efba39..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/TA-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - TA-script5 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script1.xml
deleted file mode 100644
index 18ca6699cf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - VV-script1 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script2.xml
deleted file mode 100644
index 3dd12ba1ed..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - VV-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script3.xml
deleted file mode 100644
index 3358f031e0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - VV-script3 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script4.xml
deleted file mode 100644
index 074d130f70..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - VV-script4 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script5.xml
deleted file mode 100644
index 2735fe9047..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/VV-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - VV-script5 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/WDS-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/WDS-script2.xml
deleted file mode 100644
index 6c150e333d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/WDS-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-CheckContent"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-CheckContent"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - WDS-script2 - target CheckContent"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/properties.json
deleted file mode 100644
index 550ecdf9f8..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-CheckContent/properties.json
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Sending-System",
-      "description" : "System that sends information to a receiving system" },
-    "category" : "MedicationData",
-    "variant" : 
-    { "name" : "CheckContent" },
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script1.xml
deleted file mode 100644
index 3d6197c960..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script2.xml
deleted file mode 100644
index c40e1c1922..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script3.xml
deleted file mode 100644
index d1166da13d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script3.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MA-script3 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script4.xml
deleted file mode 100644
index 4e96d55bf3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script4.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MA-script4 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script5.xml
deleted file mode 100644
index 56d53de420..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script5.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MA-script5 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script7.xml
deleted file mode 100644
index 5a2460e4fd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script7.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-7-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-7-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 7.x - Send MedicationData - MA-script7 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - Send MedicationData for C XXX_Guilliamse."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script7-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script7-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario7-x-send-meddata">
-      <name value="Scenario 7.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script7-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script8.xml
deleted file mode 100644
index 2af4015afe..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script8.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MA-script8 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MA-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MA-script8-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MA-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script1.xml
deleted file mode 100644
index 33558aae19..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MGB-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script2.xml
deleted file mode 100644
index b0d8cd5168..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MGB-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script3.xml
deleted file mode 100644
index 6c7d4bf644..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MGB-script3.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MGB-script3 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MGB-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MGB-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MGB-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script1.xml
deleted file mode 100644
index 36ef0d5142..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MTD-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script2.xml
deleted file mode 100644
index b4400926ce..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MTD-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script4.xml
deleted file mode 100644
index f87eb391a6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script4.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MTD-script4 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script5.xml
deleted file mode 100644
index 145e943e03..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script5.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MTD-script5 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script8.xml
deleted file mode 100644
index 9f40c3bf29..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MTD-script8.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MTD-script8 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MTD-script8-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MTD-script8-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MTD-script8-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script1.xml
deleted file mode 100644
index 06a0874975..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MVE-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script2.xml
deleted file mode 100644
index e8ef00c259..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MVE-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script3.xml
deleted file mode 100644
index 0be36f8e9a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script3.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MVE-script3 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script4.xml
deleted file mode 100644
index d287676039..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script4.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MVE-script4 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script5.xml
deleted file mode 100644
index a8d6d36fb7..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MVE-script5.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MVE-script5 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-MVE-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-MVE-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-MVE-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script1.xml
deleted file mode 100644
index b750b972eb..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - TA-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script2.xml
deleted file mode 100644
index 107393438c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - TA-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script3.xml
deleted file mode 100644
index 1cae9e4311..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script3.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - TA-script3 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script4.xml
deleted file mode 100644
index c6263eafc3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script4.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - TA-script4 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script5.xml
deleted file mode 100644
index a3ca819bcd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/TA-script5.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - TA-script5 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-TA-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-TA-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-TA-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script1.xml
deleted file mode 100644
index 977c443737..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script1.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - VV-script1 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script1-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script1-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script1-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script2.xml
deleted file mode 100644
index 43ebb6f68f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - VV-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script3.xml
deleted file mode 100644
index c8a91070ec..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script3.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - VV-script3 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script3-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script3-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script3-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script4.xml
deleted file mode 100644
index d88331b831..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script4.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - VV-script4 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script4-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script4-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script4-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script5.xml
deleted file mode 100644
index 017700cd75..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/VV-script5.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - VV-script5 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-VV-script5-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-VV-script5-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-VV-script5-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/WDS-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/WDS-script2.xml
deleted file mode 100644
index 8fd2343b37..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/WDS-script2.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x-Nictiz-intern"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - WDS-script2 - target Nictiz-intern"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <fixture id="mgsets-mp-smg-kwal-WDS-script2-v30">
-      <autocreate value="false"/>
-      <autodelete value="false"/>
-      <resource>
-         <reference value="../../_reference/fixtures/mgsets-mp-smg-kwal-WDS-script2-v30.xml"/>
-      </resource>
-   </fixture>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-            <sourceId value="mgsets-mp-smg-kwal-WDS-script2-v30"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/properties.json
deleted file mode 100644
index 9b4d93eb16..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/properties.json
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Sending-System",
-      "description" : "System that sends information to a receiving system" },
-    "category" : "MedicationData",
-    "variant" : 
-    { "name" : "Nictiz-intern" },
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script1.xml
deleted file mode 100644
index 35573377d2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script2.xml
deleted file mode 100644
index 6f71948200..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script3.xml
deleted file mode 100644
index 3ae36ee2d9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MA-script3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script4.xml
deleted file mode 100644
index 09772785d1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MA-script4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script5.xml
deleted file mode 100644
index 89f517765c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MA-script5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script7.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script7.xml
deleted file mode 100644
index 1754896ba5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script7.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-7-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-7-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 7.x - Send MedicationData - MA-script7"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - Send MedicationData for C XXX_Guilliamse."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario7-x-send-meddata">
-      <name value="Scenario 7.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script8.xml
deleted file mode 100644
index 47e70e877f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MA-script8.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MA-script8"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script1.xml
deleted file mode 100644
index 686a96b615..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MGB-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script2.xml
deleted file mode 100644
index 653d5fe94a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MGB-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script3.xml
deleted file mode 100644
index 26b31601fd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MGB-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MGB-script3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationStatement resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script1.xml
deleted file mode 100644
index ef910a2da0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MTD-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script2.xml
deleted file mode 100644
index a5704e123f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MTD-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script4.xml
deleted file mode 100644
index 207c73477c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MTD-script4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 4 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script5.xml
deleted file mode 100644
index fc92ae8f42..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MTD-script5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script8.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script8.xml
deleted file mode 100644
index 3f48a90a93..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MTD-script8.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-8-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-8-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 8.x - Send MedicationData - MTD-script8"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - Send MedicationData for J. XXX_Laan."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario8-x-send-meddata">
-      <name value="Scenario 8.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationAdministration resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script1.xml
deleted file mode 100644
index bfa0b77a81..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - MVE-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script2.xml
deleted file mode 100644
index 8dc1ca0f54..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - MVE-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script3.xml
deleted file mode 100644
index 26090d6e12..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - MVE-script3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script4.xml
deleted file mode 100644
index 78f2255827..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - MVE-script4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script5.xml
deleted file mode 100644
index c64019e2e1..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/MVE-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - MVE-script5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script1.xml
deleted file mode 100644
index 8e114d1bca..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - TA-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 3 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script2.xml
deleted file mode 100644
index de1baef4f3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - TA-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script3.xml
deleted file mode 100644
index e9053cc837..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - TA-script3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script4.xml
deleted file mode 100644
index 9f1b76878f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - TA-script4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script5.xml
deleted file mode 100644
index 11312cc9e3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/TA-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - TA-script5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script1.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script1.xml
deleted file mode 100644
index 3ef93f2605..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script1.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-1-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 1.x - Send MedicationData - VV-script1"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - Send MedicationData for P. XXX_Schut."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario1-x-send-meddata">
-      <name value="Scenario 1.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script2.xml
deleted file mode 100644
index 3e4a62588e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - VV-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script3.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script3.xml
deleted file mode 100644
index 6066db2bfd..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script3.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-3-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-3-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 3.x - Send MedicationData - VV-script3"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - Send MedicationData for H. XXX_Kerkhoff."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario3-x-send-meddata">
-      <name value="Scenario 3.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script4.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script4.xml
deleted file mode 100644
index 971ff62564..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script4.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-4-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-4-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 4.x - Send MedicationData - VV-script4"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - Send MedicationData for H. XXX_Smit."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario4-x-send-meddata">
-      <name value="Scenario 4.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script5.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script5.xml
deleted file mode 100644
index 38e197f983..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/VV-script5.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-5-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-5-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 5.x - Send MedicationData - VV-script5"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - Send MedicationData for J. de XXX_Luzac."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario5-x-send-meddata">
-      <name value="Scenario 5.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/WDS-script2.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/WDS-script2.xml
deleted file mode 100644
index 44b71a78f9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/WDS-script2.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
-   <id value="mp9-meddata-send-2-x"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="MP9 - Client - Scenario 2.x - Send MedicationData - WDS-script2"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - Send MedicationData for M. van XXX_Noordman."/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="scenario2-x-send-meddata">
-      <name value="Scenario 2.x"/>
-      <description value="Send MedicationData in a transaction Bundle"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="transaction"/>
-            </type>
-            <description value="Test client to POST a Bundle of type transaction."/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <responseId value="transaction-response-fixture"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that request Bundle is of type transaction."/>
-            <direction value="request"/>
-            <expression value="Bundle.type = 'transaction'"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="request"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="request"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are updated contain a Resource.id and a fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='PUT').all( $this.fullUrl.exists() and $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't contain a Resource.id. Warning only because it not forbidden, however, the resource does not need to have an id element. If an id is provided, the server SHALL ignore it."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all($this.resource.id.exists().not())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="true"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a RESTful fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').all( $this.fullUrl.startsWith('http://').not() and $this.fullUrl.startsWith('https://').not() )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all resources that are created don't have a fullUrl or have a UUID or OID based fullUrl."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(request.method='POST').fullUrl.all( exists().not or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all posted resources except Binary contain a meta.profile tag."/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.resource.where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <extension url="http://touchstone.aegis.net/touchstone/fhir/testing/StructureDefinition/testscript-assert-stopTestOnFail">
-               <valueBoolean value="true"/>
-            </extension>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the request Bundle contains 1 Medication resource(s). "/>
-            <direction value="request"/>
-            <expression value="Bundle.entry.where(resource.is(Medication)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/properties.json
deleted file mode 100644
index 1b059f9089..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System/properties.json
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Sending-System",
-      "description" : "System that sends information to a receiving system" },
-    "category" : "MedicationData",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-json.xml
deleted file mode 100644
index fa5d243b5b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-1-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-1-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - &lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="&lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationDispense and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-xml.xml
deleted file mode 100644
index 3c25682e1e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-1-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-1-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - &lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="&lt;div&gt;Alle toedieningsafspraken van de patiënt, zonder aanvullend filtercriterium (Antwoord: bericht met 5 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationDispense and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-json.xml
deleted file mode 100644
index adb1bed241..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-2-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-2-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - &lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1|MBH_300_script0_QA1_TA"/>
-      <f:description value="Filter on specific MedicationDispense identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="&lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;identifier=${filter-identifier}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-xml.xml
deleted file mode 100644
index f2ba775daa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-2-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-2-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - &lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1|MBH_300_script0_QA1_TA"/>
-      <f:description value="Filter on specific MedicationDispense identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="&lt;div&gt;Specifieke toedieningsafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_TA&#34; invoeren) (Antwoord: bericht met 1 toedieningsafspraak)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;identifier=${filter-identifier}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-json.xml
deleted file mode 100644
index 6ac21e4a86..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-3-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-3-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - &lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-xml.xml
deleted file mode 100644
index cbec0bab1b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-3-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-3-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - &lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op productcode (HPK 1119265) (Antwoord: bericht met 1 toedieningsafspraak)&#xA;Optioneel voor raadplegende systemen&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-json.xml
deleted file mode 100644
index bfae43b65f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-4-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-4-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-1}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-xml.xml
deleted file mode 100644
index cb06d49391..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-4-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-4-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-1) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-1}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml
deleted file mode 100644
index d039a43ea2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-5-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-5-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml
deleted file mode 100644
index a73cbeeeef..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-5-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-5-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11) (Antwoord: bericht met 3 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml
deleted file mode 100644
index 19836a771b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-6-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-6-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.6 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml
deleted file mode 100644
index cff50ed7b7..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-6-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-6-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.6 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - &lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-json.xml
deleted file mode 100644
index e6487031a6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-7-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-7-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.7 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - &lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-xml.xml
deleted file mode 100644
index 7ee08d3d1b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ta-Serve-0-7-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ta-Serve-0-7-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 0.7 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - &lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="&lt;div&gt;Toedieningsafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren) (Antwoord: bericht met 2 toedieningsafspraken)&lt;/div&gt;"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|422037009&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-json.xml
deleted file mode 100644
index 0d0479f0a7..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 1.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens TA script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens TA script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-xml.xml
deleted file mode 100644
index 5209212425..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 1.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens TA script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens TA script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-json.xml
deleted file mode 100644
index 48698e66db..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-10-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-10-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 10.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-xml.xml
deleted file mode 100644
index 06f40b91c4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-10-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-10-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 10.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens TA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationDispense and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-json.xml
deleted file mode 100644
index b0a365a59b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 2.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens TA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens TA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-xml.xml
deleted file mode 100644
index 4b095b84fa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 2.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens TA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens TA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-json.xml
deleted file mode 100644
index 0c0d600246..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 3.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens TA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens TA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-xml.xml
deleted file mode 100644
index ea9e257375..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 3.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens TA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens TA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-json.xml
deleted file mode 100644
index 281376066d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 4.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens TA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens TA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-xml.xml
deleted file mode 100644
index 013a4a580c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 4.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens TA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens TA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-json.xml
deleted file mode 100644
index ee4409764b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 5.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens TA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens TA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-xml.xml
deleted file mode 100644
index c75cc38791..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 5.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens TA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens TA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-json.xml
deleted file mode 100644
index c0b721a0a0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-6-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-6-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 6.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-xml.xml
deleted file mode 100644
index a397397e3c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-6-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-6-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 6.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens TA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-json.xml
deleted file mode 100644
index dc551e8efa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-9-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-9-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 9.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens TA script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens TA script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 8 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-xml.xml
deleted file mode 100644
index bcfa5bc388..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-AdministrationAgreement-serve-9-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-AdministrationAgreement-serve-9-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - AdministrationAgreement - Serve - Scenario 9.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens TA script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens TA script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationDispense"/>
-            <description value="Test server to serve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 MedicationDispense resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 8 MedicationDispense and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/properties.json
deleted file mode 100644
index 0dce889063..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/AdministrationAgreement/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Serving-System",
-      "description" : "Server that can be queried by a client (Retrieving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "AdministrationAgreement",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-json.xml
deleted file mode 100644
index c28faa17da..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-1-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-1-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 4 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-xml.xml
deleted file mode 100644
index 1467ba7d82..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-1-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-1-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle verstrekkingsverzoeken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 4 verstrekkingsverzoeken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 4 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-json.xml
deleted file mode 100644
index 847d211600..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-2-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-2-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.52711000146108.1|MBH_300_script0_QA1_VV"/>
-      <f:description value="Filter on specific DispenseRequest identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-xml.xml
deleted file mode 100644
index 8f17c8978a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-2-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-2-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.52711000146108.1|MBH_300_script0_QA1_VV"/>
-      <f:description value="Filter on specific DispenseRequest identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke verstrekkingsverzoek met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_VV&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-json.xml
deleted file mode 100644
index 2fe0af8258..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-3-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-3-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-xml.xml
deleted file mode 100644
index 20976586e3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-3-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-3-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Verstrekkingsverzoek met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-json.xml
deleted file mode 100644
index 0a0de3e2f9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-4-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-4-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-xml.xml
deleted file mode 100644
index 95b822ad5d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-vv-Serve-0-4-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-vv-Serve-0-4-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 0.4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Verstrekkingsverzoeken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 1 verstrekkingsverzoek)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|52711000146108&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-json.xml
deleted file mode 100644
index 0fe69fbd1c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 1.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens VV script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens VV script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-xml.xml
deleted file mode 100644
index 667535b98a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 1.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens VV script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens VV script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-json.xml
deleted file mode 100644
index 4d97e9baf6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-10-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-10-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 10.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-xml.xml
deleted file mode 100644
index 255f0d1450..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-10-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-10-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 10.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens VV Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-json.xml
deleted file mode 100644
index e31c933a88..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 2.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens VV script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens VV script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-xml.xml
deleted file mode 100644
index 106e71cb11..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 2.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens VV script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens VV script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-json.xml
deleted file mode 100644
index db31587cec..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 3.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens VV script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens VV script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-xml.xml
deleted file mode 100644
index cdb87eb37a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 3.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens VV script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens VV script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-json.xml
deleted file mode 100644
index 4af54cf3a5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 4.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens VV script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens VV script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-xml.xml
deleted file mode 100644
index 28392eb73d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 4.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens VV script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens VV script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-json.xml
deleted file mode 100644
index 1d39aa6a18..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 5.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens VV script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens VV script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-xml.xml
deleted file mode 100644
index 27fb08c3da..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 5.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens VV script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens VV script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-json.xml
deleted file mode 100644
index 2733e41251..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-6-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-6-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 6.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-xml.xml
deleted file mode 100644
index f0b66b457c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-6-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-6-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 6.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens VV script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-json.xml
deleted file mode 100644
index 25519fe319..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-9-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-9-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 9.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens VV script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens VV script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-xml.xml
deleted file mode 100644
index 55067d72e4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-DispenseRequest-serve-9-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-DispenseRequest-serve-9-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - DispenseRequest - Serve - Scenario 9.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens VV script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens VV script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block DispenseRequest"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/properties.json
deleted file mode 100644
index e069f29f7d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/DispenseRequest/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Serving-System",
-      "description" : "Server that can be queried by a client (Retrieving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "DispenseRequest",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-json.xml
deleted file mode 100644
index e4f4a149c6..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-1-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-1-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 12 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 12"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 15 entries. (Consists of 12 MedicationAdministration and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 15"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-xml.xml
deleted file mode 100644
index 5fc70a95b0..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-1-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-1-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatietoedieningen van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 12 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 12 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 12"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 15 entries. (Consists of 12 MedicationAdministration and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 15"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-json.xml
deleted file mode 100644
index 46b45cc32b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-2-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-2-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.18629005.1|MBH_300_script0_QA3_MTD4&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-xml.xml
deleted file mode 100644
index eb8cc2eff3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-2-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-2-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatietoedieningen met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA3_MTD4&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.18629005.1|MBH_300_script0_QA3_MTD4&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-json.xml
deleted file mode 100644
index fbae30e94a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-3-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-3-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|49255&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-xml.xml
deleted file mode 100644
index 8e052bfb4e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-3-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-3-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatietoedieningen met een filter op productcode (PRK 49255)&#xA;(Antwoord: bericht met 3 medicatietoedieningen)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|49255&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-json.xml
deleted file mode 100644
index 4f64b4ba10..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-json.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-4-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-4-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-18}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="7"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-xml.xml
deleted file mode 100644
index ed66d14b18..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4-xml.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-4-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-4-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-18)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-18}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="7"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-json.xml
deleted file mode 100644
index 301f6eb53b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-5-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-5-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=le${DATE, T, D,-21}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-xml.xml
deleted file mode 100644
index aef7da15a2..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-5-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-5-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – einddatum (alles voor T-21)&#xA;(Antwoord: bericht met 5x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=le${DATE, T, D,-21}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-json.xml
deleted file mode 100644
index 6555d23f6e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-json.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-6-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-6-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.6 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-23}&amp;effective-time=le${DATE, T, D,-11}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="7"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-xml.xml
deleted file mode 100644
index 0b1c1f2232..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6-xml.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-6-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-6-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.6 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatietoedieningen met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-23 tot en met T-11)&#xA;(Antwoord: bericht met 7x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-23}&amp;effective-time=le${DATE, T, D,-11}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="7"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-json.xml
deleted file mode 100644
index 78344b6700..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-7-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-7-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.7 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-xml.xml
deleted file mode 100644
index 2a7c1b8fc5..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-mtd-Serve-0-7-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-mtd-Serve-0-7-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 0.7 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatietoedieningen met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 3x medicatietoedieningen)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|18629005&amp;pharmaceutical-treatment-identifier=urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-json.xml
deleted file mode 100644
index 8382d0fd11..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 1.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MTD Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-xml.xml
deleted file mode 100644
index 0dad195e5a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 1.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MTD Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-json.xml
deleted file mode 100644
index 1d7fe74427..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 2.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MTD script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-xml.xml
deleted file mode 100644
index 07e8563d0e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 2.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MTD script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-json.xml
deleted file mode 100644
index db83fbdb7c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 4.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MTD Script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-xml.xml
deleted file mode 100644
index 9aefcd6f9b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 4.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MTD Script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MTD Script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-json.xml
deleted file mode 100644
index c0a25eac18..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 5.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MTD script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-xml.xml
deleted file mode 100644
index 43552c0dc9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 5.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MTD script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-json.xml
deleted file mode 100644
index 353d361d05..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-6-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-6-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 6.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-xml.xml
deleted file mode 100644
index 1bd08f460c..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-6-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-6-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 6.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-json.xml
deleted file mode 100644
index e8efc486a4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-8-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-8-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 8.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MTD script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-xml.xml
deleted file mode 100644
index 008eee5fbb..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAdministration-serve-8-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAdministration-serve-8-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAdministration - Serve - Scenario 8.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MTD script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MTD script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationAdministration"/>
-            <description value="Test server to serve MedicationAdministration resource(s) representing MP9 building block MedicationAdministration"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationAdministration resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationAdministration and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/properties.json
deleted file mode 100644
index 782c72d8ba..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAdministration/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Serving-System",
-      "description" : "Server that can be queried by a client (Retrieving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationAdministration",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-json.xml
deleted file mode 100644
index 98eb10a5ad..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-1-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-1-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.1 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-xml.xml
deleted file mode 100644
index 166d1cf8a4..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-1-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-1-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.1 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.1 - Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-1">
-      <name value="Scenario 0.1"/>
-      <description value="Alle medicatieafspraken van de patiënt, zonder aanvullend filtercriterium&#xA;(Antwoord: bericht met 5 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 9 entries. (Consists of 5 MedicationRequest and 4 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 9"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-json.xml
deleted file mode 100644
index 6607818e72..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-2-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-2-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.2 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.16076005.1|MBH_300_script0_QA1_MA"/>
-      <f:description value="Filter on specific MedicationAgreement identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-xml.xml
deleted file mode 100644
index 77c710a3bf..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-2-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-2-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.2 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.2 - Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.16076005.1|MBH_300_script0_QA1_MA"/>
-      <f:description value="Filter on specific MedicationAgreement identifier"/>
-   </f:variable>
-   <test id="Scenario-0-2">
-      <name value="Scenario 0.2"/>
-      <description value="Specifieke medicatieafspraak met identificaties als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1_MA&#34; invoeren)&#xA;(Antwoord: bericht met 1 medicatieafspraak)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-json.xml
deleted file mode 100644
index 65ceaed921..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-3-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-3-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.3 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-xml.xml
deleted file mode 100644
index f069874817..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-3-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-3-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.3 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.3 - Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-0-3">
-      <name value="Scenario 0.3"/>
-      <description value="Medicatieafspraken met een filter op productcode (PRK 1783)&#xA;(Antwoord: bericht met 1 medicatieafspraak)&#xA;Optioneel voor raadplegende systemen"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;medication.code=urn:oid:2.16.840.1.113883.2.4.4.10|1783&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-json.xml
deleted file mode 100644
index a0dff40d80..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-4-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-4-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.4 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-xml.xml
deleted file mode 100644
index 18af4f7629..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-4-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-4-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.4 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.4 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-4">
-      <name value="Scenario 0.4"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum (alles vanaf T-7)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml
deleted file mode 100644
index d4558865a3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-5-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-5-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.5 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml
deleted file mode 100644
index baa7f47c43..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-5-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-5-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.5 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.5 - Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-5">
-      <name value="Scenario 0.5"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – einddatum (alles voor T-11)&#xA;(Antwoord: bericht met 3 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml
deleted file mode 100644
index d01ea6ed87..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-6-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-6-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.6 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml
deleted file mode 100644
index d30f0223fc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-6-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-6-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.6 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.6 - Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <variable>
-      <name value="T"/>
-      <defaultValue value="${CURRENTDATE}"/>
-      <description value="Date that data and queries are expected to be relative to."/>
-   </variable>
-   <test id="Scenario-0-6">
-      <name value="Scenario 0.6"/>
-      <description value="Medicatieafspraken met een filter op gebruiksperiode – ingangsdatum én einddatum (alles vanaf T-14 tot en met T-11)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-json.xml
deleted file mode 100644
index 08c4f0b4fa..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-json.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-7-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-7-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.7 - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-xml.xml
deleted file mode 100644
index bca734300a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7-xml.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-ma-Serve-0-7-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-ma-Serve-0-7-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 0.7 - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 0.7 - Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <f:variable xmlns:nf="http://www.nictiz.nl/functions" xmlns:f="http://hl7.org/fhir">
-      <f:name value="filter-identifier"/>
-      <f:defaultValue value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.1.1|MBH_300_script0_QA1"/>
-      <f:description value="Filter on specific pharmaceutical treatment identifier"/>
-   </f:variable>
-   <test id="Scenario-0-7">
-      <name value="Scenario 0.7"/>
-      <description value="Medicatieafspraken met een specifieke medicamenteuze behandeling als filter (in kwalificatiesimulator het id van &#34;MBH_300_script0_QA1&#34; invoeren)&#xA;(Antwoord: bericht met 2 medicatieafspraken)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900596&amp;category=http://snomed.info/sct|33633005&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-json.xml
deleted file mode 100644
index 54e1879d4a..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-1-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-1-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 1.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MA Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-xml.xml
deleted file mode 100644
index 985140d2f8..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-1-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-1-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 1.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 1.x - KWAL Medicatiegegevens MA Script 1"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-1-x">
-      <name value="Scenario 1.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 1"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900663&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-json.xml
deleted file mode 100644
index 35dce0502b..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-10-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-10-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 10.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-xml.xml
deleted file mode 100644
index e57277261f..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-10-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-10-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 10.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 10.x - KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-10-x">
-      <name value="Scenario 10.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 10 (filterqueries pre-livegang kwalificatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908911&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 8 entries. (Consists of 5 MedicationRequest and 3 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 8"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-json.xml
deleted file mode 100644
index 919a3cb82d..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-2-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-2-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 2.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-xml.xml
deleted file mode 100644
index f7c7c513f9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-2-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-2-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 2.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 2.x - KWAL Medicatiegegevens MA script 2"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-2-x">
-      <name value="Scenario 2.x"/>
-      <description value="KWAL Medicatiegegevens MA script 2"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900869&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-json.xml
deleted file mode 100644
index 98fa969c09..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-3-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-3-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 3.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens MA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens MA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-xml.xml
deleted file mode 100644
index 8fcfe7bbcc..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-3-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-3-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 3.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 3.x - KWAL Medicatiegegevens MA script 3"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-3-x">
-      <name value="Scenario 3.x"/>
-      <description value="KWAL Medicatiegegevens MA script 3"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900675&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-json.xml
deleted file mode 100644
index 8506d9e152..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-4-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-4-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 4.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-xml.xml
deleted file mode 100644
index c48cb12562..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-4-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-4-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 4.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 4.x - KWAL Medicatiegegevens MA script 4"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-4-x">
-      <name value="Scenario 4.x"/>
-      <description value="KWAL Medicatiegegevens MA script 4"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900651&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 1 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 1"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 entries. (Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-json.xml
deleted file mode 100644
index 8db13c1898..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-5-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-5-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 5.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-xml.xml
deleted file mode 100644
index 0de2a16215..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-5-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-5-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 5.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 5.x - KWAL Medicatiegegevens MA script 5"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-5-x">
-      <name value="Scenario 5.x"/>
-      <description value="KWAL Medicatiegegevens MA script 5"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900699&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-json.xml
deleted file mode 100644
index 348aced722..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-6-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-6-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 6.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-xml.xml
deleted file mode 100644
index a65b94f814..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-6-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-6-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 6.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 6.x - KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-6-x">
-      <name value="Scenario 6.x"/>
-      <description value="KWAL Medicatiegegevens MA script 6 (geen medicatie)"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901175&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 0 entries. (Consists of no resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 0"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-json.xml
deleted file mode 100644
index c45fe6cf64..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-7-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-7-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 7.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - KWAL Medicatiegegevens MA Script 7"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-7-x">
-      <name value="Scenario 7.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 7"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900791&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-xml.xml
deleted file mode 100644
index 94e74d1f93..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-7-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-7-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 7.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 7.x - KWAL Medicatiegegevens MA Script 7"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-7-x">
-      <name value="Scenario 7.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 7"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900791&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 3 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 4"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-json.xml
deleted file mode 100644
index 8802d72b2e..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-8-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-8-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 8.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MA script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MA script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-xml.xml
deleted file mode 100644
index a392b99828..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-8-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-8-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 8.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 8.x - KWAL Medicatiegegevens MA script 8"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-8-x">
-      <name value="Scenario 8.x"/>
-      <description value="KWAL Medicatiegegevens MA script 8"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999900742&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 2 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 2"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 3 entries. (Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 3"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-json.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-json.xml
deleted file mode 100644
index 8d2ab1f6f3..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-json.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-9-x-json"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-9-x-json"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 9.x - JSON Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens MA Script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="json"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-xml.xml
deleted file mode 100644
index a8607a95c9..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9-xml.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript" xmlns="http://hl7.org/fhir">
-   <id value="mp9-MedicationAgreement-serve-9-x-xml"/>
-   <url value="http://nictiz.nl/fhir/TestScript/mp9-MedicationAgreement-serve-9-x-xml"/>
-   <version value="r4-mp9-3.0.0-beta-patchlevel 2025.35"/>
-   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 9.x - XML Format"/>
-   <status value="active"/>
-   <publisher value="Nictiz"/>
-   <contact>
-      <name value="Nictiz"/>
-      <telecom>
-         <system value="email"/>
-         <value value="kwalificatie@nictiz.nl"/>
-         <use value="work"/>
-      </telecom>
-   </contact>
-   <description value="Scenario 9.x - KWAL Medicatiegegevens MA Script 9"/>
-   <origin>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="false"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types"/>
-         <code value="FHIR-Client"/>
-      </profile>
-   </origin>
-   <destination>
-      <extension url="http://fhir.interoplab.eu/fhir/StructureDefinition/Interoplab-CL-ext-SUT">
-         <valueBoolean value="true"/>
-      </extension>
-      <index value="1"/>
-      <profile>
-         <system value="http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types"/>
-         <code value="FHIR-Server"/>
-      </profile>
-   </destination>
-   <profile id="Bundle-profile"
-            value="http://hl7.org/fhir/StructureDefinition/Bundle"/>
-   <test id="Scenario-9-x">
-      <name value="Scenario 9.x"/>
-      <description value="KWAL Medicatiegegevens MA Script 9"/>
-      <action>
-         <operation>
-            <type>
-               <system value="http://hl7.org/fhir/restful-interaction"/>
-               <code value="search"/>
-            </type>
-            <resource value="MedicationRequest"/>
-            <description value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
-            <accept value="xml"/>
-            <destination value="1"/>
-            <encodeRequestUrl value="true"/>
-            <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908923&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
-         </operation>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the operation was successful"/>
-            <operator value="in"/>
-            <responseCode value="200,201"/>
-            <stopTestOnFail value="true"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned resource type is Bundle."/>
-            <direction value="response"/>
-            <resource value="Bundle"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle type is searchset."/>
-            <direction value="response"/>
-            <expression value="Bundle.type"/>
-            <operator value="equals"/>
-            <stopTestOnFail value="false"/>
-            <value value="searchset"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(fullUrl.exists() and resource.id.exists()).all($this.fullUrl.endsWith($this.resource.id))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle conforms to the base FHIR specification and the resources to the stated profiles in the meta.profile tag."/>
-            <direction value="response"/>
-            <stopTestOnFail value="false"/>
-            <validateProfileId value="Bundle-profile"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Coding elements contain both a .system and a .code."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Coding)).all(system.exists() and code.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the OID of the zib valueset is not used for the system of a coding element."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(coding)).where(system.startsWith('urn:oid:2.16.840.1.113883.2.4.3.11.60.40.2')).exists().not()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value if no Coding exists or has an extension (e.g. a nullFlavor or data-absent-reason extension). For more information see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3Use_of_coded_concepts."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)) .all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/FHIR:V1.0_FHIR_IG_STU3#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/data-absent-reason').exists() or extension.where(url = 'http://hl7.org/fhir/StructureDefinition/iso21090-nullFlavor').exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all Identifiers have both a .system and a .value. In rare cases where a general category of identifiers can be used, .type can replace .system. Edge cases for both .system and .type to be unknown are not applicable to Nictiz. For more information, see https://www.hl7.org/fhir/stu3/datatypes.html#Identifier."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Identifier)).all((system.exists() or type.exists()) and value.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle total value matches or is less than the number of entries in the Bundle. The included resources should not be counted as entries in the Bundle.total."/>
-            <direction value="response"/>
-            <expression value="Bundle.total.exists() implies (Bundle.total.toInteger() &lt;= Bundle.entry.where(search.empty() or search.mode = 'match').count())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned Bundle contains a self link."/>
-            <direction value="response"/>
-            <expression value="Bundle.link.where(relation = 'self' and url.exists()).exists()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources except OperationOutcome and Binary contain a meta.profile tag."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.resource.where(is(OperationOutcome).not()).where(is(Binary).not()).where(meta.profile.empty()).empty()"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all returned resources contain an Resource.id except when temporary ids are used in the Bundle. The only time that a resource does not have an id is when it is being submitted to the server using a create operation: https://www.hl7.org/fhir/STU3/resource-definitions.html#Resource.id "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all( $this.fullUrl.matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or $this.fullUrl.matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') or $this.resource.id.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl does not disagree with the id in the resource, see http://hl7.org/fhir/stu3/bundle-definitions.html#Bundle.entry.fullUrl"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.all($this.fullUrl.endsWith($this.resource.id) or $this.fullUrl.startsWith('urn:'))"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the fullUrl is an absolute URL, an uuid or an oid."/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.fullUrl.all( startsWith('http://') or startsWith('https://') or matches('^urn:oid:[0-2](\\.(0|[1-9]\\d*))*$') or matches('^urn:uuid:[A-Fa-f\\d]{8}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{4}-[A-Fa-f\\d]{12}$') )"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all References have a display value, see https://informatiestandaarden.nictiz.nl/wiki/MedMij:V2020.01/FHIR_IG#Use_of_the_reference_datatype."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(Reference)).all(display.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that all CodeableConcept elements contain either a coding.display or a text value or has an extension (e.g. a nullFlavor or data-absent-reason extension)."/>
-            <direction value="response"/>
-            <expression value="Bundle.descendants().where($this.is(CodeableConcept)).all(coding.display.exists() or text.exists() or extension.exists())"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 5 MedicationRequest resource(s). "/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() &gt;= 5"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-      <action>
-         <assert>
-            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 5 MedicationRequest and 1 Medication resources.)"/>
-            <direction value="response"/>
-            <expression value="Bundle.entry.count() &gt;= 6"/>
-            <stopTestOnFail value="false"/>
-            <warningOnly value="false"/>
-         </assert>
-      </action>
-   </test>
-</TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/properties.json
deleted file mode 100644
index eaae5a3212..0000000000
--- a/output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Serving-System/MedicationAgreement/properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  { "goal" : "Cert",
-    "fhirVersion" : "R4",
-    "informationStandard" : "MP9 3.0.0-rc.1",
-    "usecase" : "MO",
-    "role" : 
-    { "name" : "Serving-System",
-      "description" : "Server that can be queried by a client (Retrieving-System)" },
-    "category" : "MedicationData",
-    "subcategory" : "MedicationAgreement",
-    "fhirPackage" : 
-    [ 
-      { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
-    "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Receiving-System/properties.json
index c4a0b206c9..87d09f7fed 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
index 4c0cbf4cf8..e7d847b6ff 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
index 085c5ac328..f46e9efb2d 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/properties.json
index fda7714109..2214b4818a 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/AdministrationAgreement/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/DispenseRequest/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/DispenseRequest/properties.json
index 4cfb6c8708..6be1c0035f 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/DispenseRequest/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/DispenseRequest/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
index 5862528d6c..c7fd84f2ed 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
@@ -44,12 +44,12 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="search"/>
             </type>
-            <resource value="MedicationAdministration"/>
+            <resource value=""/>
             <description value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
          </operation>
       </action>
       <action>
@@ -72,9 +72,9 @@
       </action>
       <action>
          <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationAdministration resource(s). "/>
+            <description value="Confirm that the returned searchset Bundle contains 4  resource(s). "/>
             <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
+            <expression value="Bundle.entry.where(resource.is()).count() = 4"/>
             <stopTestOnFail value="false"/>
             <warningOnly value="false"/>
          </assert>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
index 6ff6a4411e..af79fd9476 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
@@ -44,12 +44,12 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="search"/>
             </type>
-            <resource value="MedicationAdministration"/>
+            <resource value=""/>
             <description value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
          </operation>
       </action>
       <action>
@@ -72,9 +72,9 @@
       </action>
       <action>
          <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationAdministration resource(s). "/>
+            <description value="Confirm that the returned searchset Bundle contains 4  resource(s). "/>
             <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
+            <expression value="Bundle.entry.where(resource.is()).count() = 4"/>
             <stopTestOnFail value="false"/>
             <warningOnly value="false"/>
          </assert>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
index 79f151a1a2..e73e746322 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
@@ -44,12 +44,12 @@
                <system value="http://hl7.org/fhir/restful-interaction"/>
                <code value="search"/>
             </type>
-            <resource value="MedicationAdministration"/>
+            <resource value=""/>
             <description value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
             <destination value="1"/>
             <encodeRequestUrl value="true"/>
             <origin value="1"/>
-            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+            <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
          </operation>
       </action>
       <action>
@@ -72,9 +72,9 @@
       </action>
       <action>
          <assert>
-            <description value="Confirm that the returned searchset Bundle contains 4 MedicationAdministration resource(s). "/>
+            <description value="Confirm that the returned searchset Bundle contains 4  resource(s). "/>
             <direction value="response"/>
-            <expression value="Bundle.entry.where(resource.is(MedicationAdministration)).count() = 4"/>
+            <expression value="Bundle.entry.where(resource.is()).count() = 4"/>
             <stopTestOnFail value="false"/>
             <warningOnly value="false"/>
          </assert>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/properties.json
index 6337c1add2..1edc708091 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAdministration/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
index 412e733661..fbf5b412f7 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
index 55d1107bdd..dc4c3a5efe 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/properties.json
index 3b58e3da84..52b001fd4a 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationAgreement/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
index b94b772271..199a39146b 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -75,14 +75,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
index 7b084bfd55..b81012e152 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -75,14 +75,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/properties.json
index 2cb8b75b63..8551db750d 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationDispense/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
index 227f18a8fc..97d4952e62 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
index e968f815ae..0f1d32fc6b 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -75,11 +75,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/properties.json
index b0bf710dd5..5e6ccd9293 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/MedicationUse/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 214cf204ee..e963557b05 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -57,16 +57,41 @@
             <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901084&amp;category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;_include=MedicationRequest:medication"/>
          </operation>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Make sure that the server of the test simulator gives a success response."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the server of the test simulator returns a Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 5 entries. (Consists of 3 MedicationRequest and 2 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 5"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index c569f68c27..405b7217d3 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -57,16 +57,41 @@
             <params value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901084&amp;category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationRequest:medication"/>
          </operation>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Make sure that the server of the test simulator gives a success response."/>
+            <operator value="in"/>
+            <responseCode value="200,201"/>
+            <stopTestOnFail value="true"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the server of the test simulator returns a Bundle."/>
+            <direction value="response"/>
+            <resource value="Bundle"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 4"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json
index 7d1df27cc8..2502462c96 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System-Nictiz-intern/properties.json
index 5e49e6f1f1..42e80a51d1 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System/properties.json
index 1e35d934fa..00807da21f 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml
index cdc21f491b..5d8d950b74 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml
index e959932498..ff8394858e 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml
index 775168b0bc..a495829a14 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml
index 7a9ed7e51e..aec55b4124 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/properties.json
index eb0613b910..b3f7778685 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/AdministrationAgreement/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/DispenseRequest/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/DispenseRequest/properties.json
index 71a9fbc2c3..ae5dd2babb 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/DispenseRequest/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/DispenseRequest/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAdministration/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAdministration/properties.json
index 82f9e6b218..3c0736cfbf 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAdministration/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAdministration/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml
index 01beca07ac..7eab2038b2 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml
index 06e7e10e13..64ff85c7ac 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml
index 1b11e680af..35d02ea6a1 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml
index 1858caefc5..a49f9997e3 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationRequest and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/properties.json
index 95d33d637d..05306375c6 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationAgreement/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-json.xml
index 41c3f82cbf..d8ab93e376 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-json.xml
@@ -251,14 +251,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-xml.xml
index b6e511796d..e39d6fffa7 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4-xml.xml
@@ -251,14 +251,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-json.xml
index 6571840e0f..6097ecc37d 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-json.xml
@@ -251,14 +251,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-xml.xml
index 9e9320aa00..a8ec02820d 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5-xml.xml
@@ -251,14 +251,23 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationDispense resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationDispense)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.count() &gt;= 6"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
    </test>
 </TestScript>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/properties.json
index 3edc330854..858f1bf306 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationDispense/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-json.xml
index b8766f41c5..5f0b463f3e 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-xml.xml
index 3679b9f4fd..bbd2f07892 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-json.xml
index e1011f77cb..425a4ef83b 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-xml.xml
index e9176e2811..193e23cbcc 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 3 MedicationStatement resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationStatement)).count() = 3"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 6 entries. (Consists of 3 MedicationStatement and 3 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/properties.json
index 835344fdca..5f62086168 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/MedicationUse/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-json.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-json.xml
index d00da356d8..4476e29431 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-json.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-json.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-xml.xml b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-xml.xml
index 53a945c3e6..21231e1645 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-xml.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6-xml.xml
@@ -251,11 +251,15 @@
             <warningOnly value="false"/>
          </assert>
       </action>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      <action>
+         <assert>
+            <description value="Confirm that the returned searchset Bundle contains 2 MedicationRequest resource(s). "/>
+            <direction value="response"/>
+            <expression value="Bundle.entry.where(resource.is(MedicationRequest)).count() = 2"/>
+            <stopTestOnFail value="false"/>
+            <warningOnly value="false"/>
+         </assert>
+      </action>
       <action>
          <assert>
             <description value="Confirm that the returned searchset Bundle contains at least 4 entries. (Consists of 2 MedicationRequest and 2 Medication resources.)"/>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/properties.json
index 61d175ea70..571085f1ef 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationData/Serving-System/VariableDosingRegimen/properties.json
@@ -11,5 +11,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Receiving-System/properties.json
index b21a5eeb9a..838e99642d 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System-Nictiz-intern/properties.json
index 2ab0761e79..4210822282 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System/properties.json
index b6440c2e94..804e3b4947 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/MedicationPrescription/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/properties.json
index 6e405c0e4c..f609aa03a3 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System-Nictiz-intern/properties.json
index 37d11b752f..fd7601d132 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System/properties.json
index e68abdf0ba..a95328f949 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/PrescrProcessing/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Receiving-System/properties.json
index 4a6935648e..6f4bec1bce 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System-Nictiz-intern/properties.json
index 9c24d84266..efdb40dd64 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System/properties.json
index e645c9ff91..c41fc3d142 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalMA/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Receiving-System/properties.json
index f36d55c46a..a1d2794eda 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System-Nictiz-intern/properties.json
index 4720888e7b..6827368085 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System/properties.json
index edda087e9c..224cc90507 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ProposalVV/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Receiving-System/properties.json
index 2712207dc9..01b58058d5 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System-Nictiz-intern/properties.json
index f14097e047..85deec809a 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System/properties.json
index c7fbe7cc32..0463e6c5ca 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalMA/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Receiving-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Receiving-System/properties.json
index 9a9169abd7..1be44d43b4 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Receiving-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Receiving-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System-Nictiz-intern/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System-Nictiz-intern/properties.json
index 2a52c49c09..e09b535b92 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System-Nictiz-intern/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System-Nictiz-intern/properties.json
@@ -12,5 +12,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System/properties.json b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System/properties.json
index 19a491ad8a..f7ad5c5995 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System/properties.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/ReplyProposalVV/Sending-System/properties.json
@@ -10,5 +10,5 @@
     "fhirPackage" : 
     [ 
       { "name" : "nictiz.fhir.nl.r4.medicationprocess9",
-        "version" : "2.0.0-rc.3" } ],
+        "version" : "2.0.0-rc.2" } ],
     "serverAlias" : "nictiz" }
\ No newline at end of file
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.json b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.json
index a696bb71e4..9c2fc791a3 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.json
@@ -191,15 +191,16 @@
       "url": "MedicationRequest"
     }
   }, {
-    "fullUrl": "urn:uuid:ff84bd66-8d1f-11ef-9586-020000000000",
+    "fullUrl": "urn:uuid:f5862197-b4ae-11f0-7269-020000000000",
     "resource": {
       "resourceType": "Observation",
+      "id": "f58628df-b4ae-11f0-7269-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult" ]
       },
       "text": {
         "status": "extensions",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Specimen</th>\n                  <td colspan=\"3\">monster</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"eGFR volgens CKD-EPI formule (3583 - nhg-tabel-45-diagnostische-bepalingen)\">eGFR volgens CKD-EPI formule</span>\n                  </td>\n                  <td>97 mL/min/{1.73_m2}</td>\n                  <td>Iets bovengemiddeld</td>\n                  <td>\n                    <div>90 mL/min/{1.73_m2} - </div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Specimen</th>\n                  <td colspan=\"3\">monster</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"eGFR volgens CKD-EPI formule (3583 - nhg-tabel-45-diagnostische-bepalingen)\">eGFR volgens CKD-EPI formule</span>\n                  </td>\n                  <td>97 mL/min/{1.73_m2}</td>\n                  <td>Iets bovengemiddeld</td>\n                  <td>\n                    <div>90 mL/min/{1.73_m2} - </div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
       },
       "extension": [ {
         "url": "http://nictiz.nl/fhir/StructureDefinition/ext-CopyIndicator",
@@ -230,11 +231,11 @@
       "subject": {
         "reference": "urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000",
         "type": "Patient",
-        "display": "Patient, Eduardo XXX_Doppen"
+        "display": "Patient, E. XXX_Doppen"
       },
       "effectiveDateTime": "${DATE, T, D, -20}",
       "performer": [ {
-        "reference": "urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000",
+        "reference": "urn:uuid:f586216f-b4ae-11f0-7269-020000000000",
         "type": "Organization",
         "display": "Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"
       } ],
@@ -248,7 +249,7 @@
         "text": "Iets bovengemiddeld"
       } ],
       "specimen": {
-        "reference": "urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000",
+        "reference": "urn:uuid:f58621d3-b4ae-11f0-7269-020000000000",
         "type": "Specimen",
         "display": "monster"
       },
@@ -266,15 +267,16 @@
       "url": "Observation"
     }
   }, {
-    "fullUrl": "urn:uuid:ff84bd84-8d1f-11ef-9586-020000000000",
+    "fullUrl": "urn:uuid:f58621ab-b4ae-11f0-7269-020000000000",
     "resource": {
       "resourceType": "Observation",
+      "id": "f58628f1-b4ae-11f0-7269-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult" ]
       },
       "text": {
         "status": "extensions",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Methode</th>\n                  <td colspan=\"3\">\n                    <span title=\"enzyme method (258026004 - SNOMED CT)\">enzyme method</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Specimen</th>\n                  <td colspan=\"3\">monster</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"creatinine (523 - nhg-tabel-45-diagnostische-bepalingen)\">creatinine</span>\n                  </td>\n                  <td>135 umol/l</td>\n                  <td>\n                    <span title=\"boven referentiebereik (281302008 - SNOMED CT)\">boven referentiebereik</span>, Creatinine iets hoger dan normaal.</td>\n                  <td>\n                    <div>60 umol/l - 110 umol/l</div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Methode</th>\n                  <td colspan=\"3\">\n                    <span title=\"enzyme method (258026004 - SNOMED CT)\">enzyme method</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Specimen</th>\n                  <td colspan=\"3\">monster</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"creatinine (523 - nhg-tabel-45-diagnostische-bepalingen)\">creatinine</span>\n                  </td>\n                  <td>135 umol/l</td>\n                  <td>\n                    <span title=\"boven referentiebereik (281302008 - SNOMED CT)\">boven referentiebereik</span>, Creatinine iets hoger dan normaal.</td>\n                  <td>\n                    <div>60 umol/l - 110 umol/l</div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
       },
       "extension": [ {
         "url": "http://nictiz.nl/fhir/StructureDefinition/ext-CopyIndicator",
@@ -305,11 +307,11 @@
       "subject": {
         "reference": "urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000",
         "type": "Patient",
-        "display": "Patient, Eduardo XXX_Doppen"
+        "display": "Patient, E. XXX_Doppen"
       },
       "effectiveDateTime": "${DATE, T, D, -20}",
       "performer": [ {
-        "reference": "urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000",
+        "reference": "urn:uuid:f586216f-b4ae-11f0-7269-020000000000",
         "type": "Organization",
         "display": "Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"
       } ],
@@ -340,7 +342,7 @@
         } ]
       },
       "specimen": {
-        "reference": "urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000",
+        "reference": "urn:uuid:f58621d3-b4ae-11f0-7269-020000000000",
         "type": "Specimen",
         "display": "monster"
       },
@@ -364,15 +366,16 @@
       "url": "Observation"
     }
   }, {
-    "fullUrl": "urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000",
+    "fullUrl": "urn:uuid:f58621d3-b4ae-11f0-7269-020000000000",
     "resource": {
       "resourceType": "Specimen",
+      "id": "f586290a-b4ae-11f0-7269-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.Specimen" ]
       },
       "text": {
         "status": "extensions",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Specimen. Subject: Patient, Eduardo XXX_Doppen. Id: 1111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4267.2)</caption>\n              <tfoot>\n                <tr>\n                  <td colspan=\"2\">Serum afgenomen bij patiënt.</td>\n                </tr>\n              </tfoot>\n              <tbody>\n                <tr>\n                  <th>Type</th>\n                  <td>\n                    <span title=\"Bloed (87612001 - SNOMED CT)\">Bloed</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Inzameling</th>\n                  <td>${DATE, T, D, -20}</td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Specimen. Subject: Patient, E. XXX_Doppen. Id: 1111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4267.2)</caption>\n              <tfoot>\n                <tr>\n                  <td colspan=\"2\">Serum afgenomen bij patiënt.</td>\n                </tr>\n              </tfoot>\n              <tbody>\n                <tr>\n                  <th>Type</th>\n                  <td>\n                    <span title=\"Bloed (87612001 - SNOMED CT)\">Bloed</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Inzameling</th>\n                  <td>${DATE, T, D, -20}</td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
       },
       "identifier": [ {
         "system": "urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4267.2",
@@ -388,7 +391,7 @@
       "subject": {
         "reference": "urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000",
         "type": "Patient",
-        "display": "Patient, Eduardo XXX_Doppen"
+        "display": "Patient, E. XXX_Doppen"
       },
       "collection": {
         "collectedDateTime": "${DATE, T, D, -20}"
@@ -638,9 +641,10 @@
       "url": "Organization"
     }
   }, {
-    "fullUrl": "urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000",
+    "fullUrl": "urn:uuid:f586216f-b4ae-11f0-7269-020000000000",
     "resource": {
       "resourceType": "Organization",
+      "id": "f5862595-b4ae-11f0-7269-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization" ]
       },
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
index d8bf14aa55..701c63ee5b 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
@@ -261,9 +261,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff84bd66-8d1f-11ef-9586-020000000000"/>
+    <fullUrl value="urn:uuid:f5862197-b4ae-11f0-7269-020000000000"/>
     <resource>
       <Observation>
+        <id value="f58628df-b4ae-11f0-7269-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
         </meta>
@@ -271,7 +272,7 @@
           <status value="extensions"/>
           <div xmlns="http://www.w3.org/1999/xhtml">
             <table>
-              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
+              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
               </caption>
               <tbody>
                 <tr>
@@ -330,11 +331,11 @@
         <subject>
           <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
           <type value="Patient"/>
-          <display value="Patient, Eduardo XXX_Doppen"/>
+          <display value="Patient, E. XXX_Doppen"/>
         </subject>
         <effectiveDateTime value="${DATE, T, D, -20}"/>
         <performer>
-          <reference value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+          <reference value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
           <type value="Organization"/>
           <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
         </performer>
@@ -348,7 +349,7 @@
           <text value="Iets bovengemiddeld"/>
         </interpretation>
         <specimen>
-          <reference value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+          <reference value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
           <type value="Specimen"/>
           <display value="monster"/>
         </specimen>
@@ -368,9 +369,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff84bd84-8d1f-11ef-9586-020000000000"/>
+    <fullUrl value="urn:uuid:f58621ab-b4ae-11f0-7269-020000000000"/>
     <resource>
       <Observation>
+        <id value="f58628f1-b4ae-11f0-7269-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
         </meta>
@@ -378,7 +380,7 @@
           <status value="extensions"/>
           <div xmlns="http://www.w3.org/1999/xhtml">
             <table>
-              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
+              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
               </caption>
               <tbody>
                 <tr>
@@ -444,11 +446,11 @@
         <subject>
           <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
           <type value="Patient"/>
-          <display value="Patient, Eduardo XXX_Doppen"/>
+          <display value="Patient, E. XXX_Doppen"/>
         </subject>
         <effectiveDateTime value="${DATE, T, D, -20}"/>
         <performer>
-          <reference value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+          <reference value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
           <type value="Organization"/>
           <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
         </performer>
@@ -481,7 +483,7 @@
           </coding>
         </method>
         <specimen>
-          <reference value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+          <reference value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
           <type value="Specimen"/>
           <display value="monster"/>
         </specimen>
@@ -507,9 +509,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+    <fullUrl value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
     <resource>
       <Specimen>
+        <id value="f586290a-b4ae-11f0-7269-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.Specimen"/>
         </meta>
@@ -517,7 +520,7 @@
           <status value="extensions"/>
           <div xmlns="http://www.w3.org/1999/xhtml">
             <table>
-              <caption>Specimen. Subject: Patient, Eduardo XXX_Doppen. Id: 1111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4267.2)</caption>
+              <caption>Specimen. Subject: Patient, E. XXX_Doppen. Id: 1111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4267.2)</caption>
               <tfoot>
                 <tr>
                   <td colspan="2">Serum afgenomen bij patiënt.</td>
@@ -552,7 +555,7 @@
         <subject>
           <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
           <type value="Patient"/>
-          <display value="Patient, Eduardo XXX_Doppen"/>
+          <display value="Patient, E. XXX_Doppen"/>
         </subject>
         <collection>
           <collectedDateTime value="${DATE, T, D, -20}"/>
@@ -855,9 +858,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+    <fullUrl value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
     <resource>
       <Organization>
+        <id value="f5862595-b4ae-11f0-7269-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
         </meta>
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.json b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.json
index 06b61997f4..2dc6933e5a 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.json
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.json
@@ -191,15 +191,16 @@
       "url": "MedicationRequest"
     }
   }, {
-    "fullUrl": "urn:uuid:ff82c060-8d1f-11ef-1133-020000000000",
+    "fullUrl": "urn:uuid:f518fd5b-b4ae-11f0-4794-020000000000",
     "resource": {
       "resourceType": "Observation",
+      "id": "f51915b5-b4ae-11f0-4794-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult" ]
       },
       "text": {
         "status": "extensions",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"Glomerulaire filtratiesnelheid/1,73 m2.voorspeld [filtratiesnelheid/oppervlakte] in serum of plasma of bloed d.m.v. formule gebaseerd op creatinine (CKD-EPI 2021) (98979-8 - LOINC)\">Glomerulaire filtratiesnelheid/1,73 m2.voorspeld [filtratiesnelheid/oppervlakte] in serum of plasma of bloed d.m.v. formule gebaseerd op creatinine (CKD-EPI 2021)</span>\n                  </td>\n                  <td>97 mL/min/{1.73_m2}</td>\n                  <td>Waarde is goed.</td>\n                  <td>\n                    <div>90 mL/min/{1.73_m2} - </div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">${DATE, T, D, -20}</td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"Glomerulaire filtratiesnelheid/1,73 m2.voorspeld [filtratiesnelheid/oppervlakte] in serum of plasma of bloed d.m.v. formule gebaseerd op creatinine (CKD-EPI 2021) (98979-8 - LOINC)\">Glomerulaire filtratiesnelheid/1,73 m2.voorspeld [filtratiesnelheid/oppervlakte] in serum of plasma of bloed d.m.v. formule gebaseerd op creatinine (CKD-EPI 2021)</span>\n                  </td>\n                  <td>97 mL/min/{1.73_m2}</td>\n                  <td>Waarde is goed.</td>\n                  <td>\n                    <div>90 mL/min/{1.73_m2} - </div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
       },
       "extension": [ {
         "url": "http://nictiz.nl/fhir/StructureDefinition/ext-CopyIndicator",
@@ -230,11 +231,11 @@
       "subject": {
         "reference": "urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000",
         "type": "Patient",
-        "display": "Patient, Eduardo XXX_Doppen"
+        "display": "Patient, E. XXX_Doppen"
       },
       "effectiveDateTime": "${DATE, T, D, -20}",
       "performer": [ {
-        "reference": "urn:uuid:ff82c024-8d1f-11ef-1133-020000000000",
+        "reference": "urn:uuid:f518fd33-b4ae-11f0-4794-020000000000",
         "type": "Organization",
         "display": "Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"
       } ],
@@ -261,15 +262,16 @@
       "url": "Observation"
     }
   }, {
-    "fullUrl": "urn:uuid:ff82c07e-8d1f-11ef-1133-020000000000",
+    "fullUrl": "urn:uuid:f518fd6f-b4ae-11f0-4794-020000000000",
     "resource": {
       "resourceType": "Observation",
+      "id": "f51915c7-b4ae-11f0-4794-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult" ]
       },
       "text": {
         "status": "extensions",
-        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">09:10:00, 1 maart 2022</td>\n                </tr>\n                <tr>\n                  <th>Methode</th>\n                  <td colspan=\"3\">\n                    <span title=\"enzyme method (258026004 - SNOMED CT)\">enzyme method</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"Creatinine [mol/volume] in urine (45066-8 - LOINC)\">Creatinine [mol/volume] in urine</span>\n                  </td>\n                  <td>135 umol/l</td>\n                  <td>\n                    <span title=\"boven referentiebereik (281302008 - SNOMED CT)\">boven referentiebereik</span>, Creatinine iets hoger dan normaal.</td>\n                  <td>\n                    <div>62 umol/l - 134 umol/l</div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
+        "div": "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n            <table>\n              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title=\"Laboratory (laboratory - HL7 observation-category)\">Laboratory</span>, Status: definitief<span style=\"display: block;\">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>\n              </caption>\n              <tbody>\n                <tr>\n                  <th>Bepalingdatum/tijd</th>\n                  <td colspan=\"3\">09:10:00, 1 maart 2022</td>\n                </tr>\n                <tr>\n                  <th>Methode</th>\n                  <td colspan=\"3\">\n                    <span title=\"enzyme method (258026004 - SNOMED CT)\">enzyme method</span>\n                  </td>\n                </tr>\n                <tr>\n                  <th>Code</th>\n                  <th>Waarde</th>\n                  <th>Interpretatie</th>\n                  <th>Referentiewaarden</th>\n                </tr>\n                <tr>\n                  <td>\n                    <span title=\"Creatinine [mol/volume] in urine (45066-8 - LOINC)\">Creatinine [mol/volume] in urine</span>\n                  </td>\n                  <td>135 umol/l</td>\n                  <td>\n                    <span title=\"boven referentiebereik (281302008 - SNOMED CT)\">boven referentiebereik</span>, Creatinine iets hoger dan normaal.</td>\n                  <td>\n                    <div>62 umol/l - 134 umol/l</div>\n                  </td>\n                </tr>\n              </tbody>\n            </table>\n          </div>"
       },
       "extension": [ {
         "url": "http://nictiz.nl/fhir/StructureDefinition/ext-CopyIndicator",
@@ -300,11 +302,11 @@
       "subject": {
         "reference": "urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000",
         "type": "Patient",
-        "display": "Patient, Eduardo XXX_Doppen"
+        "display": "Patient, E. XXX_Doppen"
       },
       "effectiveDateTime": "2022-03-01T09:10:00+01:00",
       "performer": [ {
-        "reference": "urn:uuid:ff82c024-8d1f-11ef-1133-020000000000",
+        "reference": "urn:uuid:f518fd33-b4ae-11f0-4794-020000000000",
         "type": "Organization",
         "display": "Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"
       } ],
@@ -590,9 +592,10 @@
       "url": "Organization"
     }
   }, {
-    "fullUrl": "urn:uuid:ff82c024-8d1f-11ef-1133-020000000000",
+    "fullUrl": "urn:uuid:f518fd33-b4ae-11f0-4794-020000000000",
     "resource": {
       "resourceType": "Organization",
+      "id": "f518f9c4-b4ae-11f0-4794-020000000000",
       "meta": {
         "profile": [ "http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization" ]
       },
diff --git a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
index 44c9478371..48c39ac60c 100644
--- a/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
+++ b/output/R4/MP9-3-0-0-beta/MO/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
@@ -261,9 +261,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff82c060-8d1f-11ef-1133-020000000000"/>
+    <fullUrl value="urn:uuid:f518fd5b-b4ae-11f0-4794-020000000000"/>
     <resource>
       <Observation>
+        <id value="f51915b5-b4ae-11f0-4794-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
         </meta>
@@ -271,7 +272,7 @@
           <status value="extensions"/>
           <div xmlns="http://www.w3.org/1999/xhtml">
             <table>
-              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
+              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 11111 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
               </caption>
               <tbody>
                 <tr>
@@ -326,11 +327,11 @@
         <subject>
           <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
           <type value="Patient"/>
-          <display value="Patient, Eduardo XXX_Doppen"/>
+          <display value="Patient, E. XXX_Doppen"/>
         </subject>
         <effectiveDateTime value="${DATE, T, D, -20}"/>
         <performer>
-          <reference value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+          <reference value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
           <type value="Organization"/>
           <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
         </performer>
@@ -359,9 +360,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff82c07e-8d1f-11ef-1133-020000000000"/>
+    <fullUrl value="urn:uuid:f518fd6f-b4ae-11f0-4794-020000000000"/>
     <resource>
       <Observation>
+        <id value="f51915c7-b4ae-11f0-4794-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
         </meta>
@@ -369,7 +371,7 @@
           <status value="extensions"/>
           <div xmlns="http://www.w3.org/1999/xhtml">
             <table>
-              <caption>Observatie/bepaling. Subject: Patient, Eduardo XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
+              <caption>Observatie/bepaling. Subject: Patient, E. XXX_Doppen. Id: 22222 (urn:oid:2.16.840.1.113883.2.4.3.11.999.25.4298.2), Categorie: <span title="Laboratory (laboratory - HL7 observation-category)">Laboratory</span>, Status: definitief<span style="display: block;">Uitvoerende: Healthcare provider (organization), Klinisch chemisch Lab 't Proefje</span>
               </caption>
               <tbody>
                 <tr>
@@ -431,11 +433,11 @@
         <subject>
           <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
           <type value="Patient"/>
-          <display value="Patient, Eduardo XXX_Doppen"/>
+          <display value="Patient, E. XXX_Doppen"/>
         </subject>
         <effectiveDateTime value="2022-03-01T09:10:00+01:00"/>
         <performer>
-          <reference value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+          <reference value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
           <type value="Organization"/>
           <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
         </performer>
@@ -776,9 +778,10 @@
     </request>
   </entry>
   <entry>
-    <fullUrl value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+    <fullUrl value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
     <resource>
       <Organization>
+        <id value="f518f9c4-b4ae-11f0-4794-020000000000"/>
         <meta>
           <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
         </meta>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
index e1adb03fab..2f418e8b62 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -27,12 +27,11 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
-       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
index 3170013082..14ad9861cf 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
index 9a779d7e03..8f6f76f162 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
@@ -27,9 +27,8 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
-       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 1878c810f5..8ecdf1a75e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-18}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="7"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
index 0b83fbb0c8..118942e1f6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=le${DATE, T, D,-21}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
index 6460a73c76..ac8b443511 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-23}&amp;effective-time=le${DATE, T, D,-11}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="10"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
index 5075fd100b..2189a1d2e8 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
index 2f07538621..8128b08155 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
index 607beab165..d359e6f555 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
index 4e1902d8b2..ddc91f050f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-18}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
index a609b0bb2a..f07c0b423d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=le${DATE, T, D,-13}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
index 8ff338a400..37cd3426c9 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-14}&amp;whenhandedover=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="2"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
index db2521350e..b68f97ef28 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-6}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
index 7acf04d1db..1dd1b12601 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=le${DATE, T, D,-13}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
index d7e8520249..58f49b361e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
index 0962645a6d..22d139efc7 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index 7221445bd1..c214a44b6f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -27,8 +27,7 @@
                              value="?category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
@@ -36,6 +35,6 @@
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 4 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index 539b074f30..65276d66d6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -32,8 +32,7 @@
                              value="?category=http://snomed.info/sct|395067002&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
@@ -41,6 +40,6 @@
          <nts:with-parameter name="count" value="2"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index b935efb0d6..590bb0d094 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-10}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index 1def4bbcb7..461b4fb7f1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=lt${DATE, T, D,-14}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index cc903ab33b..7445a1c0e1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -28,8 +28,7 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-16}&amp;period-of-use=le${DATE, T, D,-9}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index 7f7c42b4e6..5eaada5577 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -32,15 +32,14 @@
                              value="?category=http://snomed.info/sct|395067002&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> 
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include>-->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
index 23e6df8e52..8b158b28be 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->     
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
index 04ba67ba19..8d078c14ac 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 1fe913d593..9a6e534b4d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="7"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
index 9f8d361e06..2415cb03ea 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -29,15 +29,14 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
-      </nts:include> 
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
index cf0da7306a..2d2ac2d791 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="10"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
index e0d839b3e3..e984a7be26 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
index 509e24d988..3f657111dc 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
index b469245008..99672dda0b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
index dacbbd1911..3a27a386dd 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
index 05f8135769..4f211422b0 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
index c994e2b717..5fc8ae8919 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="2"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
index 5b343c6754..a406d20844 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
index 5ce36dfb99..2c763817ee 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
index fef1f990a3..d7e572e1ee 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
index e66536ef6a..5c854f9c20 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCountAtLeast" scope="project">
+      <nts:include value="assert-returnCountAtLeast" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index 689f0466ab..83e818c60c 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -28,8 +28,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 4 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index 39b8fc9601..fa5fe93e1e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -33,8 +33,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
@@ -42,6 +41,6 @@
          <nts:with-parameter name="count" value="2"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 01c14b7774..6c2c468775 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index aa9dab34eb..fa98d6b267 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index 0ee6b66d7c..e040072f14 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -29,8 +29,7 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
@@ -38,6 +37,6 @@
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index e754ff00c6..1183826b41 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -33,15 +33,14 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> 
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="3"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include>-->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml b/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
index 103f324a03..68fe683dd6 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
@@ -43,6 +43,15 @@
          <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_LOS || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
       </valueReference>
    </extension>
+   <modifierExtension url="http://nictiz.nl/fhir/StructureDefinition/ext-StopType">
+      <valueCodeableConcept>
+         <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="410546004"/>
+            <display value="stopgezet"/>
+         </coding>
+      </valueCodeableConcept>
+   </modifierExtension>
    <identifier>
       <system value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
       <value value="MBH_300_SCRIPT9_TA_LOS_STOP"/>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml b/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
index 32b279a3bf..2ea0c574f0 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference-medmij/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
@@ -77,7 +77,6 @@
             <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
          </valueReference>
       </extension>
-      <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
    </basedOn>
    <dosageInstruction>
       <timing>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/av-mp-va-kwal-script9-stop-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/av-mp-va-kwal-script9-stop-v30.xml
index 2fcc090598..bbcb62acde 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/av-mp-va-kwal-script9-stop-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/av-mp-va-kwal-script9-stop-v30.xml
@@ -200,6 +200,15 @@
                   <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_LOS || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                </valueReference>
             </extension>
+            <modifierExtension url="http://nictiz.nl/fhir/StructureDefinition/ext-StopType">
+               <valueCodeableConcept>
+                  <coding>
+                     <system value="http://snomed.info/sct"/>
+                     <code value="410546004"/>
+                     <display value="stopgezet"/>
+                  </coding>
+               </valueCodeableConcept>
+            </modifierExtension>
             <identifier>
                <system value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                <value value="MBH_300_SCRIPT9_TA_LOS_STOP"/>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-MA-script9-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-MA-script9-v30.xml
index cb149323c3..961c8b38cb 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-MA-script9-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-MA-script9-v30.xml
@@ -476,7 +476,6 @@
                      <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                   </valueReference>
                </extension>
-               <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
             </basedOn>
             <dosageInstruction>
                <timing>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-TA-script9-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-TA-script9-v30.xml
index 004792e3ac..a78da0b9ff 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-TA-script9-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mg-mp-mg-kwal-TA-script9-v30.xml
@@ -528,6 +528,15 @@
                   <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_LOS || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                </valueReference>
             </extension>
+            <modifierExtension url="http://nictiz.nl/fhir/StructureDefinition/ext-StopType">
+               <valueCodeableConcept>
+                  <coding>
+                     <system value="http://snomed.info/sct"/>
+                     <code value="410546004"/>
+                     <display value="stopgezet"/>
+                  </coding>
+               </valueCodeableConcept>
+            </modifierExtension>
             <identifier>
                <system value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                <value value="MBH_300_SCRIPT9_TA_LOS_STOP"/>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
index 103f324a03..68fe683dd6 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-AdmAgr-mp9-MBH300SCRIPT9TALOSSTOP.xml
@@ -43,6 +43,15 @@
          <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_LOS || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
       </valueReference>
    </extension>
+   <modifierExtension url="http://nictiz.nl/fhir/StructureDefinition/ext-StopType">
+      <valueCodeableConcept>
+         <coding>
+            <system value="http://snomed.info/sct"/>
+            <code value="410546004"/>
+            <display value="stopgezet"/>
+         </coding>
+      </valueCodeableConcept>
+   </modifierExtension>
    <identifier>
       <system value="urn:oid:2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
       <value value="MBH_300_SCRIPT9_TA_LOS_STOP"/>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
index f19645b845..2ea0c574f0 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mp-MedAgr-mp9-MBH300SCRIPT9MAANNULERING.xml
@@ -76,7 +76,6 @@
             </identifier>
             <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
          </valueReference>
-         <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
       </extension>
    </basedOn>
    <dosageInstruction>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4a-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4a-v30.xml
index 00e994172e..1edc688e30 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4a-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4a-v30.xml
@@ -405,9 +405,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff6602e0-8d1f-11ef-1518-020000000000"/>
+      <fullUrl value="urn:uuid:ee98e242-b4ae-11f0-2026-020000000000"/>
       <resource>
          <Observation>
+            <id value="ee98d32a-b4ae-11f0-2026-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -443,7 +444,7 @@
             </subject>
             <effectiveDateTime value="${DATE, T, D, -30}"/>
             <performer>
-               <reference value="urn:uuid:ff66025e-8d1f-11ef-1518-020000000000"/>
+               <reference value="urn:uuid:ee98e21a-b4ae-11f0-2026-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -457,7 +458,7 @@
                <text value="Waarde is te laag. Stadium 4 nierfalen, ernstige nierfunctiestoornis."/>
             </interpretation>
             <specimen>
-               <reference value="urn:uuid:ff66031c-8d1f-11ef-1518-020000000000"/>
+               <reference value="urn:uuid:ee98e26a-b4ae-11f0-2026-020000000000"/>
                <type value="Specimen"/>
                <display value="monster"/>
             </specimen>
@@ -476,29 +477,11 @@
          <url value="Observation"/>
       </request>
    </entry>
-   <!-- NICTIZ-36334 -->
    <entry>
-      <fullUrl value="urn:uuid:ff66033a-8d1f-11ef-1518-020000000000"/>
-      <resource>
-         <Device>
-            <meta>
-               <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.SpecimenSource"/>
-            </meta>
-            <deviceName>
-               <name value="Verzamelbeker"/>
-               <type value="other"/>
-            </deviceName>
-         </Device>
-      </resource>
-      <request>
-         <method value="POST"/>
-         <url value="Device"/>
-      </request>
-   </entry>
-   <entry>
-      <fullUrl value="urn:uuid:ff66031c-8d1f-11ef-1518-020000000000"/>
+      <fullUrl value="urn:uuid:ee98e26a-b4ae-11f0-2026-020000000000"/>
       <resource>
          <Specimen>
+            <id value="ee98d33c-b4ae-11f0-2026-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.Specimen"/>
             </meta>
@@ -514,7 +497,7 @@
                </coding>
             </type>
             <subject>
-               <reference value="urn:uuid:ff66033a-8d1f-11ef-1518-020000000000"/>
+               <reference value="urn:uuid:ee98e27e-b4ae-11f0-2026-020000000000"/>
                <type value="Device"/>
                <display value="bron_monster"/>
             </subject>
@@ -739,9 +722,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff66025e-8d1f-11ef-1518-020000000000"/>
+      <fullUrl value="urn:uuid:ee98e21a-b4ae-11f0-2026-020000000000"/>
       <resource>
          <Organization>
+            <id value="ee98d34e-b4ae-11f0-2026-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
             </meta>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4b-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4b-v30.xml
index 33e1a38cca..b3916948ef 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4b-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script4b-v30.xml
@@ -405,9 +405,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff6514de-8d1f-11ef-2090-020000000000"/>
+      <fullUrl value="urn:uuid:ee5077b7-b4ae-11f0-2465-020000000000"/>
       <resource>
          <Observation>
+            <id value="ee508b8b-b4ae-11f0-2465-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -443,7 +444,7 @@
             </subject>
             <effectiveDateTime value="${DATE, T, D, -30}"/>
             <performer>
-               <reference value="urn:uuid:ff65145c-8d1f-11ef-2090-020000000000"/>
+               <reference value="urn:uuid:ee50778f-b4ae-11f0-2465-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -457,7 +458,7 @@
                <text value="Waarde is te laag. Stadium 4 nierfalen, ernstige nierfunctiestoornis."/>
             </interpretation>
             <specimen>
-               <reference value="urn:uuid:ff65151a-8d1f-11ef-2090-020000000000"/>
+               <reference value="urn:uuid:ee5077df-b4ae-11f0-2465-020000000000"/>
                <type value="Specimen"/>
                <display value="monster"/>
             </specimen>
@@ -476,29 +477,11 @@
          <url value="Observation"/>
       </request>
    </entry>
-   <!-- NICTIZ-36334 -->
    <entry>
-      <fullUrl value="urn:uuid:ff651538-8d1f-11ef-2090-020000000000"/>
-      <resource>
-         <Device>
-            <meta>
-               <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.SpecimenSource"/>
-            </meta>
-            <deviceName>
-               <name value="Verzamelbeker"/>
-               <type value="other"/>
-            </deviceName>
-         </Device>
-      </resource>
-      <request>
-         <method value="POST"/>
-         <url value="Device"/>
-      </request>
-   </entry>
-   <entry>
-      <fullUrl value="urn:uuid:ff65151a-8d1f-11ef-2090-020000000000"/>
+      <fullUrl value="urn:uuid:ee5077df-b4ae-11f0-2465-020000000000"/>
       <resource>
          <Specimen>
+            <id value="ee508b9d-b4ae-11f0-2465-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.Specimen"/>
             </meta>
@@ -514,7 +497,7 @@
                </coding>
             </type>
             <subject>
-               <reference value="urn:uuid:ff651538-8d1f-11ef-2090-020000000000"/>
+               <reference value="urn:uuid:ee5077f3-b4ae-11f0-2465-020000000000"/>
                <type value="Device"/>
                <display value="bron_monster"/>
             </subject>
@@ -739,9 +722,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff65145c-8d1f-11ef-2090-020000000000"/>
+      <fullUrl value="urn:uuid:ee50778f-b4ae-11f0-2465-020000000000"/>
       <resource>
          <Organization>
+            <id value="ee508baf-b4ae-11f0-2465-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
             </meta>
diff --git a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script9-annulering-v30.xml b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script9-annulering-v30.xml
index edce5abc49..1a8f086e66 100644
--- a/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script9-annulering-v30.xml
+++ b/src/MP9-3-0-0-beta/Cert/_reference/fixtures/mv-mp-vo-kwal-script9-annulering-v30.xml
@@ -89,7 +89,6 @@
                      <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
                   </valueReference>
                </extension>
-               <display value="relatie naar toedieningsafspraak met identificatie: MBH_300_SCRIPT9_TA_TOEKOMSTIG || 2.16.840.1.113883.2.4.3.11.999.77.422037009.1"/>
             </basedOn>
             <dosageInstruction>
                <timing>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
index d501a756f7..e24c819f69 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-22}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
index f858dc9647..23a8df061c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
index ec8e0b5515..82eaec8073 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
@@ -14,22 +14,22 @@
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
                    nts:in-targets="MedMij">
          <nts:with-parameter name="description"
                              value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
index 40a1b991ce..9a4027ff8f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
@@ -14,22 +14,22 @@
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
                    nts:in-targets="MedMij">
          <nts:with-parameter name="description"
                              value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
index 1dbe46b3c1..9505f668d9 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
@@ -14,22 +14,22 @@
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
                    nts:in-targets="MedMij">
          <nts:with-parameter name="description"
                              value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
index 3cf6a96088..2a8b531b84 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=le${DATE, T, D,-22}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
index b485bf6709..451027ad7a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
index e48656d92f..d3fa01d185 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -28,14 +28,14 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-21}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="breakdown"
+                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
       </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
index 4950c66853..84ea88d94e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -28,14 +28,14 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=le${DATE, T, D,-22}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="breakdown"
+                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
       </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
index b70d3f17fa..70b1d17604 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=le${DATE, T, D,-22}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
index bb927c27b7..2d93d026b5 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -28,11 +28,10 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 08c788f924..a3199c9c5a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -27,8 +27,7 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
@@ -37,6 +36,6 @@
          <nts:with-parameter name="count" value="5"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index a37bc512b9..b215fe6880 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -27,16 +27,15 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
                              value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
index 6ddcc9c468..a58a85c1cb 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
index d98d9f2d64..3c6af85f9d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
index 353918b4e4..3efbd90eb1 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
index 3c333837dc..3080581116 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
index 4ad377791a..b1b8c57800 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -29,14 +29,14 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="breakdown"
+                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
       </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
index 5919ba654a..33cce86569 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -29,14 +29,14 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="breakdown"
+                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
       </nts:include>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
index 99bb0d869f..9afa4f6a9a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
index 9895af0a0f..7c66405210 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="6"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index 72821d7b23..ce402572be 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -29,11 +29,10 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
       <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="4"/>
          <nts:with-parameter name="breakdown"
diff --git a/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml b/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
index 1dade3b23c..85bddbf110 100644
--- a/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
+++ b/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-a-nierfunctie-NHG-v30.xml
@@ -183,9 +183,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff84bd66-8d1f-11ef-9586-020000000000"/>
+      <fullUrl value="urn:uuid:f5862197-b4ae-11f0-7269-020000000000"/>
       <resource>
          <Observation>
+            <id value="f58628df-b4ae-11f0-7269-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -217,11 +218,11 @@
             <subject>
                <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
                <type value="Patient"/>
-               <display value="Patient, Eduardo XXX_Doppen"/>
+               <display value="Patient, E. XXX_Doppen"/>
             </subject>
             <effectiveDateTime value="${DATE, T, D, -20}"/>
             <performer>
-               <reference value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+               <reference value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -235,7 +236,7 @@
                <text value="Iets bovengemiddeld"/>
             </interpretation>
             <specimen>
-               <reference value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+               <reference value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
                <type value="Specimen"/>
                <display value="monster"/>
             </specimen>
@@ -255,9 +256,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff84bd84-8d1f-11ef-9586-020000000000"/>
+      <fullUrl value="urn:uuid:f58621ab-b4ae-11f0-7269-020000000000"/>
       <resource>
          <Observation>
+            <id value="f58628f1-b4ae-11f0-7269-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -289,11 +291,11 @@
             <subject>
                <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
                <type value="Patient"/>
-               <display value="Patient, Eduardo XXX_Doppen"/>
+               <display value="Patient, E. XXX_Doppen"/>
             </subject>
             <effectiveDateTime value="${DATE, T, D, -20}"/>
             <performer>
-               <reference value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+               <reference value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -326,7 +328,7 @@
                </coding>
             </method>
             <specimen>
-               <reference value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+               <reference value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
                <type value="Specimen"/>
                <display value="monster"/>
             </specimen>
@@ -352,9 +354,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff84bdc0-8d1f-11ef-9586-020000000000"/>
+      <fullUrl value="urn:uuid:f58621d3-b4ae-11f0-7269-020000000000"/>
       <resource>
          <Specimen>
+            <id value="f586290a-b4ae-11f0-7269-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult.Specimen"/>
             </meta>
@@ -372,7 +375,7 @@
             <subject>
                <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
                <type value="Patient"/>
-               <display value="Patient, Eduardo XXX_Doppen"/>
+               <display value="Patient, E. XXX_Doppen"/>
             </subject>
             <collection>
                <collectedDateTime value="${DATE, T, D, -20}"/>
@@ -597,9 +600,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff84bd2a-8d1f-11ef-9586-020000000000"/>
+      <fullUrl value="urn:uuid:f586216f-b4ae-11f0-7269-020000000000"/>
       <resource>
          <Organization>
+            <id value="f5862595-b4ae-11f0-7269-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
             </meta>
diff --git a/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml b/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
index f20a7f001b..8e19b277b4 100644
--- a/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
+++ b/src/MP9-3-0-0-beta/Test/_reference/fixtures/mv-mp-vo-tst-4-2-b-nierfunctie-loinc-zonder-panel-v30.xml
@@ -183,9 +183,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff82c060-8d1f-11ef-1133-020000000000"/>
+      <fullUrl value="urn:uuid:f518fd5b-b4ae-11f0-4794-020000000000"/>
       <resource>
          <Observation>
+            <id value="f51915b5-b4ae-11f0-4794-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -217,11 +218,11 @@
             <subject>
                <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
                <type value="Patient"/>
-               <display value="Patient, Eduardo XXX_Doppen"/>
+               <display value="Patient, E. XXX_Doppen"/>
             </subject>
             <effectiveDateTime value="${DATE, T, D, -20}"/>
             <performer>
-               <reference value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+               <reference value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -250,9 +251,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff82c07e-8d1f-11ef-1133-020000000000"/>
+      <fullUrl value="urn:uuid:f518fd6f-b4ae-11f0-4794-020000000000"/>
       <resource>
          <Observation>
+            <id value="f51915c7-b4ae-11f0-4794-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-LaboratoryTestResult"/>
             </meta>
@@ -284,11 +286,11 @@
             <subject>
                <reference value="urn:uuid:834e3f9e-6ad4-11ec-0000-020000000000"/>
                <type value="Patient"/>
-               <display value="Patient, Eduardo XXX_Doppen"/>
+               <display value="Patient, E. XXX_Doppen"/>
             </subject>
             <effectiveDateTime value="2022-03-01T09:10:00+01:00"/>
             <performer>
-               <reference value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+               <reference value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
                <type value="Organization"/>
                <display value="Healthcare provider (organization), Klinisch chemisch Lab 't Proefje"/>
             </performer>
@@ -551,9 +553,10 @@
       </request>
    </entry>
    <entry>
-      <fullUrl value="urn:uuid:ff82c024-8d1f-11ef-1133-020000000000"/>
+      <fullUrl value="urn:uuid:f518fd33-b4ae-11f0-4794-020000000000"/>
       <resource>
          <Organization>
+            <id value="f518f9c4-b4ae-11f0-4794-020000000000"/>
             <meta>
                <profile value="http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthcareProvider-Organization"/>
             </meta>