diff --git a/src/Geboortezorg-3-0/Cert/PHR-Client/gbz-fhir3-0-2-izk-phr-4-1.xml b/src/Geboortezorg-3-0/Cert/PHR-Client/gbz-fhir3-0-2-izk-phr-4-1.xml
index de7aee1797..fe8f0effdc 100644
--- a/src/Geboortezorg-3-0/Cert/PHR-Client/gbz-fhir3-0-2-izk-phr-4-1.xml
+++ b/src/Geboortezorg-3-0/Cert/PHR-Client/gbz-fhir3-0-2-izk-phr-4-1.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-model href="http://hl7.org/fhir/STU3/testscript.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
-<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript" nts:scenario="client">
+<TestScript xmlns="http://hl7.org/fhir"
+            xmlns:nts="http://nictiz.nl/xsl/testscript"
+            nts:scenario="client">
    <id value="gbz-fhir3-0-2-ikz-phr-4-1"/>
    <version value="stu3-3.0"/>
    <name value="Nictiz Geboortezorg - Client - Scenario 4.1 - Retrieve Integrale Zwangerschapskaart resources of fifth pregnancy of Maaike Ostendorf"/>
    <description value="Scenario 4.1: Retrieve Integrale Zwangerschapskaart resources of fifth pregnancy of Maaike Ostendorf"/>
-   <nts:authToken patientResourceId="MAAIKEXXX-Ostendorf"/>
-   <nts:fixture id="episodeofcare-fixture" href="Verloskunde-Casus1/medmij-gbz-bc-MaternalRecord-ca7cf58a-200b-417c-acb5-8aa6a6e692d5.xml"/>
-   <variable><name value="episode-id"/><expression value="EpisodeOfCare.id"/><sourceId value="episodeofcare-fixture"/></variable>
+   <nts:authToken patientResourceId="MAAIKE-M-XXX-OSTENDORF"/>
+   <nts:include value="gbz-variable-episode-id" name="episode-id" sourceId="fixture-5-ServeMaternalRecord"/>
    <variable><name value="T"/><defaultValue value="${CURRENTDATE}"/></variable>
-   
    <!-- Patient - Zwangere vrouw -->
    <test id="1-RetrieveWoman">
       <name value="1-RetrieveWoman"/>
-      <description value="Query Patient resource for HCIM Patient"/>
+      <description value="Query Patient resource for HCIM Woman"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="Patient"/>         
+         <nts:with-parameter name="resource" value="Patient"/>
       </nts:include>
       <nts:include value="assert.response.numResources" scope="common">
          <nts:with-parameter name="resource" value="Patient"/>
@@ -23,506 +23,469 @@
          <nts:with-parameter name="atLeast"/>
       </nts:include>
    </test>
-   
-   <!-- Coverage - Verzekeraar -->
-   <test id="2-RetrievePayer">
-      <name value="2-RetrievePayer"/>
-      <description value="Query Coverage resource for HCIM Payer"/>
-      <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="Coverage"/>         
-      </nts:include>
-      <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="Coverage"/>
-         <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="atLeast"/>
-      </nts:include>
-   </test>
-     
-   <!-- DeviceUseStatement - Urinekatheter -->
-   <test id="4-RetrieveDeviceUseStatement">
-      <name value="4-RetrieveDeviceUseStatement"/>
-      <description value="Query DeviceUseStatement resource for HCIM BladderFunction-UrineCatheter"/>
-      <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="DeviceUseStatement"/>         
-         <nts:with-parameter name="params" value="?_include=DeviceUseStatement:device"/>
-      </nts:include>
-      <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="DeviceUseStatement"/>
-         <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="atLeast"/>
-      </nts:include>
-   </test>
-   
+
    <!-- EpisodeOfCare - zorgepisode zwangerschap -->
    <test id="5-RetrieveMaternalRecord">
       <name value="5-RetrieveMaternalRecord"/>
-      <description value="Test Client query operation for MaternalRecord (EpisodeOfCare) including managing organization (Organization) and care manager (Practitioner)"/>
+      <description value="Test Server query operation for MaternalRecord (EpisodeOfCare) including managing organization (Organization) and care manager (Practitioner)"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="EpisodeOfCare"/>
          <nts:with-parameter name="params" value="?type=http://snomed.info/sct|364320009&amp;_include=EpisodeOfCare:organization&amp;_include=EpisodeOfCare:care-manager"/>
+         <nts:with-parameter name="responseId" value="fixture-5-ServeMaternalRecord"/>
       </nts:include>
       <nts:include value="assert.response.numResources" scope="common" resource="EpisodeOfCare" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Organization" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Practitioner" count="1"/>
    </test>
-     
-   <!-- Conditions - Problemen gerelateerd aan zorgepisode incl. zwangerschap -->
-   <test id="6-RetrieveConditions">
-      <name value="6-RetrieveConditions"/>
-      <description value="Test Client query operation for Conditions (including Pregnancy)"/>
+
+   <!-- Conditions - Problemen gerelateerd aan zorgepisode -->
+   <test id="6a-RetrieveConditions">
+      <name value="6a-RetrieveConditions"/>
+      <description value="Test Server query operation for Conditions (including Pregnancy)"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
       </nts:include>
-      <!-- Zwangerschap -->
+      <!-- bevinding betreffende zwangerschap (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Zwangerschap)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="118185001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende zwangerschap (bevinding)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="118185001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- UWI -->
+      <!-- astma (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(urineweginfectie)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="2"></nts:with-parameter>
-         <nts:with-parameter name="code" value="307534009"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="astma (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="195967001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Eerstegraads perineumruptuur durante partu -->
+      <!-- toestand patiënt verslechterd -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(eerstegraads perineumruptuur durante partu)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="199916005"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="toestand patiënt verslechterd"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="271299001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- toestand van patiënt verslechterd -->
+      <!-- urineweginfectie tijdens zwangerschap (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(toestand van patiënt verslechterd)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="271299001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="urineweginfectie tijdens zwangerschap (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="307534009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Asthma -->
+      <!-- pyelonefritis (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(asthma)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="195967001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="pyelonefritis (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="45816000"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Pyelonephritis -->
+      <!-- eerstegraads perineumruptuur (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pyelonephritis)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="45816000"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="eerstegraads perineumruptuur (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="57759005"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Colitis ulcerosa -->
+      <!-- colitis ulcerosa (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(colitis ulcerosa)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="64766004"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="colitis ulcerosa (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="64766004"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
    </test>
-   
+
    <!-- Encounters -->
    <test id="7-RetrieveEncounters">
       <name value="7-RetrieveEncounters"/>
-      <description value="Test Client query operation for Encounters"/>
+      <description value="Test Server query operation for Encounters"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="Encounter"/>
          <nts:with-parameter name="params" value="?episodeofcare=EpisodeOfCare/${episode-id}&amp;_include=Encounter:practitioner"/>
       </nts:include>
-      <nts:include value="assert.response.numResources" scope="common" resource="Encounter" count="2"/>
+      <nts:include value="assert.response.numResources" scope="common" resource="Encounter" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Practitioner" count="1"/>
-      <!-- Prenatale controle -->
+      <!-- consult (verrichting) -->
       <nts:include value="assert.response.numResourcesWithCode" scope="common">
-         <nts:with-parameter name="additionalDescription" value="(ContactSoort)"></nts:with-parameter>
-         <nts:with-parameter name="codedElement" value="type"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Encounter"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="11429006"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="(ContactSoort)"/>
+         <nts:with-parameter name="codedElement" value="type"/>
+         <nts:with-parameter name="resource" value="Encounter"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="11429006"/>
       </nts:include>
-      <!-- Partusassistentie -->
-      <nts:include value="assert.response.numResourcesWithCode" scope="common">
-         <nts:with-parameter name="additionalDescription" value="(ContactSoort)"></nts:with-parameter>
-         <nts:with-parameter name="codedElement" value="type"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Encounter"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="236973005"></nts:with-parameter>
-      </nts:include>
-   </test>  
-      
-   <!-- Observations - Observaties gekoppeld aan episode -->  
+   </test>
+
+   <!-- Observations - Observaties gekoppeld aan episode -->
    <test id="8a-RetrieveObservations">
       <name value="8a-RetrieveObservations"/>
-      <description value="Test Client query operation for Observations"/>
+      <description value="Test Server query operation for Observations"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
       </nts:include>
-      <!-- lichaamslengte -->
+      <!-- [#] Parity -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(lichaamslengte)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="8302-2"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="[#] Parity"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="11977-6"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- pregnancy duration -->
+      <!-- [#] Pregnancies -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pregnancy duration)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="3"></nts:with-parameter>
-         <nts:with-parameter name="code" value="57036006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="[#] Pregnancies"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="11996-6"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- parity -->
+      <!-- Body mass index (BMI) [Ratio] -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(parity)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="11977-6"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="Body mass index (BMI) [Ratio]"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="39156-5"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- gravidity -->
+      <!-- Body height -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(gravidity)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="11996-6"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="Body height"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="8302-2"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- a terme datum -->
+      <!-- Datum van laatste menstruatie [datum] -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(a terme datum)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="147781000146105"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="Datum van laatste menstruatie [datum]"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="8665-2"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- voorgeschiedenis abortus -->
+      <!-- datum van einde van zwangerschap (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(voorgeschiedenis abortus)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="713651007"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="datum van einde van zwangerschap (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="118951000146109"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- aantal levende nakomelingen -->
+      <!-- datum en tijd van geboorte van placenta (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(aantal levende nakomelingen)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="143881000146107"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="datum en tijd van geboorte van placenta (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="136311000146100"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- datum einde zwangerschap -->
+      <!-- voorkeur voor locatie van bevalling (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(datum einde zwangerschap)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="118951000146109"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="voorkeur voor locatie van bevalling (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="142961000146102"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- voorkeur plaats bevalling -->
+      <!-- aantal levende nakomelingen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(voorkeur plaats bevalling)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="142961000146102"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="aantal levende nakomelingen (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="143881000146107"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- perinatale sterfte -->
+      <!-- definitieve uitgerekende datum van partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(perinatale sterfte)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="276507005"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="definitieve uitgerekende datum van partus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="147781000146105"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- tijdstip breken vliezen -->
+      <!-- manier waarop eerste fase van partus is begonnen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tijdstip breken vliezen)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="289251005"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="manier waarop eerste fase van partus is begonnen (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="160611000146102"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- datum begin actieve ontsluiting -->
+      <!-- datum van begin van eerste fase van partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(datum begin actieve ontsluiting)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="160621000146107"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="datum van begin van eerste fase van partus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="160621000146107"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+      </nts:include>
+      <!-- geschatte datum van partus (waarneembare entiteit) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="geschatte datum van partus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="161714006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+      </nts:include>
+      <!-- voorgeschiedenis met eerdere zwangerschap met intra-uteriene foetale dood (situatie) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="voorgeschiedenis met eerdere zwangerschap met intra-uteriene foetale dood (situatie)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="16216731000119106"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+      </nts:include>
+      <!-- aspect van vruchtwater (waarneembare entiteit) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="aspect van vruchtwater (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="168089007"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- aard vruchtwater -->
+      <!-- geboorte van placenta (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(aard vruchtwater)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="366334007"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="geboorte van placenta (verrichting)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="236994008"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- geboorteplaats -->
+      <!-- begin van persen tijdens partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(geboorteplaats)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="366344009"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="begin van persen tijdens partus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="249163006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- type partus -->
+      <!-- aantal bloedvaten in navelstreng (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(type partus)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="364336006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="aantal bloedvaten in navelstreng (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="249191003"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- bloedverlies -->
+      <!-- presenterend deel van foetus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloedverlies)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="364332008"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="presenterend deel van foetus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="271692001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- ligging kind bij geboorte -->
+      <!-- tijdstip waarop gebroken vliezen zijn geconstateerd (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(ligging kind bij geboorte)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="271692001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="tijdstip waarop gebroken vliezen zijn geconstateerd (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="289251005"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- tijdstip actief meepersen -->
+      <!-- bloedverlies durante partu (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tijdstip actief meepersen)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="249163006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bloedverlies durante partu (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="364332008"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- conditie perineum -->
+      <!-- soort partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(conditie perineum)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="364297003"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="soort partus (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="364336006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- geboorte placenta -->
+      <!-- compleetheid van placenta (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(conditie perineum)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="236994008"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="compleetheid van placenta (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="364343000"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- rhesus c -->
+      <!-- compleetheid van vruchtvliezen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(rhesus c)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="1159-3"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="compleetheid van vruchtvliezen (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="364351002"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- rhesus d -->
+      <!-- bevinding betreffende locatie van partus -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(rhesus d)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="1305-2"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende locatie van partus"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="366344009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- bloedgroep -->
+      <!-- zwangerschapsduur -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloedgroep)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="883-9"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="zwangerschapsduur"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="code" value="57036006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- wijze Begin Baring -->
+      <!-- bevinding betreffende bekkenregio van romp (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(wijze Begin Baring)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="160611000146102"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende bekkenregio van romp (bevinding)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="609625009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
    </test>
-   
-   <!-- Observations - Observaties gekoppeld aan prenatale controle -->  
+
+   <!-- Observations - Observaties gekoppeld aan prenatale controle -->
    <test id="8b-RetrieveObservations">
       <name value="8b-RetrieveObservations"/>
-      <description value="Test Client query operation for Observations"/>  
+      <description value="Test Server query operation for Observations"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
       </nts:include>
-      <!-- alcoholgebruik -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(alcohol use)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="228273003"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
-      </nts:include>
-      <!-- tabakgebruik -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tobacco use)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="365980008"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
-      </nts:include>
-      <!-- drugsgebruik -->
+      <!-- Lichaamsgewicht [massa] -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(drug use)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="228366006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="Lichaamsgewicht [massa]"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="29463-7"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- pregnancy duration -->
+      <!-- Bloeddruk panel waarvan alle leden optioneel in arterieel vaatstelsel -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pregnancy duration)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="57036006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="Bloeddruk panel waarvan alle leden optioneel in arterieel vaatstelsel"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="85354-9"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <!-- foetale beweging -->
+      <!-- bevinding betreffende alcoholgebruik (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(foetale beweging)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="364618000"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende alcoholgebruik (bevinding)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="228273003"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- lichaamsgewicht -->
+      <!-- bevinding betreffende drugsgebruik (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(lichaamsgewicht)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="29463-7"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende drugsgebruik (bevinding)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="228366006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- bloeddruk -->
+      <!-- bevinding betreffende tabakgebruik en blootstelling aan tabaksrook (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloeddruk)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="85354-9"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende tabakgebruik en blootstelling aan tabaksrook (bevinding)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="365980008"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
    </test>
 
    <!-- Alle verrichtingen -->
    <test id="9-RetrieveProcedures">
       <name value="9-RetrieveProcedures"/>
-      <description value="Test Client query operation for (Obstetric) Procedures"/>
+      <description value="Query Procedure resource for HCIM Procedures"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
          <nts:with-parameter name="resource" value="Procedure"/>
-         <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}&amp;_include=Procedure:performer&amp;_include=Procedure:based-on"/>
       </nts:include>
-      <nts:include value="assert.response.numResources" scope="common" resource="Procedure" count="5"/>
-      <nts:include value="assert.response.numResources" scope="common" resource="Organization" count="0"/>
-      <nts:include value="assert.response.numResources" scope="common" resource="ProcedureRequest" count="0"/>
-      <!-- Verrichting (Bevalling) -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Bevalling)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Procedure"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="236973005"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+      <nts:include value="assert.response.numResources" scope="common">
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="atLeast"/>
       </nts:include>
-      <!-- Verrichting (Geboorte) -->
+      <!-- operatie van bewegingsapparaat (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Geboorte)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Procedure"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="3950001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="operatie van bewegingsapparaat (verrichting)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="112697007"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Verrichting (Strippen vliezen) -->
+      <!-- operatie van vrouwelijk geslachtsorgaan (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Strippen vliezen)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Procedure"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="236960006"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="operatie van vrouwelijk geslachtsorgaan (verrichting)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="12658000"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Verrichting (Operatie van bewegingsapparaat) -->
+      <!-- strippen van vliezen (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Operatie van bewegingsapparaat)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Procedure"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="112697007"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="strippen van vliezen (verrichting)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="236960006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- Verrichting (Operatie van vrouwelijk geslachtsorgaan) -->
+      <!-- verlossing (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Operatie van vrouwelijk geslachtsorgaan)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Procedure"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="12658000"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="verlossing (verrichting)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="236973005"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-   </test>
-   
-   <!-- Zorgteam -->
-   <test id="10-RetrieveCareTeam">
-      <name value="10-RetrieveCareTeam"/>
-      <description value="Test Client query operation for CareTeam"/>  
-      <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="CareTeam"/>
-         <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
+      <!-- echografie van foetus (verrichting) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="echografie van foetus (verrichting)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="241491007"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="CareTeam"/>
-         <nts:with-parameter name="count" value="0"/>
+      <!-- geboorte (bevinding) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="geboorte (bevinding)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="3950001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
    </test>
 
-   <!-- RelatedPerson -->
-   <test id="11-RetrieveRelatedPerson">
-      <name value="11-RetrieveRelatedPerson"/>
-      <description value="Query RelatedPerson resource for RelatedPerson"/>
+   <!-- Consent -->
+   <test id="12-RetrieveConsent">
+      <name value="12-RetrieveConsent"/>
+      <description value="Test Server query operation for Consent"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="RelatedPerson"/>         
+         <nts:with-parameter name="resource" value="Consent"/>
       </nts:include>
       <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="RelatedPerson"/>
+         <nts:with-parameter name="resource" value="Consent"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="atLeast"/>
       </nts:include>
    </test>
 
-   <!-- TreatmentDirective -->
-   <test id="12-RetrieveTreatmentDirective">
-      <name value="12-RetrieveTreatmentDirective"/>
-      <description value="Query Consent resource for HCIM TreatmentDirective"/>
+   <!-- RelatedPerson -->
+   <test id="13-RetrieveRelatedPerson">
+      <name value="13-RetrieveRelatedPerson"/>
+      <description value="Test Server query operation for RelatedPerson"/>
       <nts:include value="medmij/test.phr.successfulsearch" scope="common">
-         <nts:with-parameter name="resource" value="Consent"/>         
+         <nts:with-parameter name="resource" value="RelatedPerson"/>
       </nts:include>
       <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="Consent"/>
+         <nts:with-parameter name="resource" value="RelatedPerson"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="atLeast"/>
       </nts:include>
    </test>
-   
-   <!-- TODO: RelatedPerson, TreatmentDirective, zib Problem/Procedure (List?)-->
-   
+
 </TestScript>
diff --git a/src/Geboortezorg-3-0/Cert/XIS-Server/gbz-fhir3-0-2-izk-xis-4-1.xml b/src/Geboortezorg-3-0/Cert/XIS-Server/gbz-fhir3-0-2-izk-xis-4-1.xml
index 34dbe0bde3..fed3e2cd64 100644
--- a/src/Geboortezorg-3-0/Cert/XIS-Server/gbz-fhir3-0-2-izk-xis-4-1.xml
+++ b/src/Geboortezorg-3-0/Cert/XIS-Server/gbz-fhir3-0-2-izk-xis-4-1.xml
@@ -7,56 +7,24 @@
    <version value="stu3-3.0"/>
    <name value="Nictiz Geboortezorg - Server - Scenario 4.1 - Serve Integrale Zwangerschapskaart resources of fifth pregnancy of Maaike Ostendorf"/>
    <description value="Scenario 4.1: Serve Integrale Zwangerschapskaart resources of fifth pregnancy of Maaike Ostendorf"/>
-   <nts:authToken patientResourceId="MAAIKEXXX-Ostendorf"/>
-<!--   <variable><name value="episode-id"/><defaultValue value="ca7cf58a-200b-417c-acb5-8aa6a6e692d5"/></variable>-->
+   <nts:authToken patientResourceId="MAAIKE-M-XXX-OSTENDORF"/>
    <nts:include value="gbz-variable-episode-id" name="episode-id" sourceId="fixture-5-ServeMaternalRecord"/>
    <variable><name value="T"/><defaultValue value="${CURRENTDATE}"/></variable>
-   
    <!-- Patient - Zwangere vrouw -->
    <test id="1-ServeWoman">
       <name value="1-ServeWoman"/>
-      <description value="Query Patient resource for HCIM Patient"/>
+      <description value="Query Patient resource for HCIM Woman"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
-         <nts:with-parameter name="resource" value="Patient"/>         
-      </nts:include>   
-      <nts:include value="assert.response.numResources" scope="common">
          <nts:with-parameter name="resource" value="Patient"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="atLeast"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-nl-core-patient-MAAIKEXXX-Ostendorf.xml"
-                          nts:in-targets="CheckContent"/>
-   </test>
-   
-   <!-- Coverage - Verzekeraar -->
-   <test id="2-ServePayer">
-      <name value="2-ServePayer"/>
-      <description value="Query Coverage resource for HCIM Payer"/>
-      <nts:include value="medmij/test.xis.successfulSearch" scope="common">
-         <nts:with-parameter name="resource" value="Coverage"/>         
-      </nts:include>   
-      <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="Coverage"/>
-         <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="atLeast"/>
-      </nts:include>
-   </test>
-   
-   <!-- DeviceUseStatement - Urinekatheter -->
-   <test id="4-ServeDeviceUseStatement">
-      <name value="4-ServeDeviceUseStatement"/>
-      <description value="Query DeviceUseStatement resource for HCIM BladderFunction-UrineCatheter"/>
-      <nts:include value="medmij/test.xis.successfulSearch" scope="common">
-         <nts:with-parameter name="resource" value="DeviceUseStatement"/>         
-         <nts:with-parameter name="params" value="?_include=DeviceUseStatement:device"/>
-      </nts:include>   
       <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="DeviceUseStatement"/>
-         <nts:with-parameter name="count" value="0"/>
+         <nts:with-parameter name="resource" value="Patient"/>
+         <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="atLeast"/>
       </nts:include>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-Woman-MAAIKE-M-XXX-OSTENDORF.xml" nts:in-targets="CheckContent"/>
    </test>
-   "
+
    <!-- EpisodeOfCare - zorgepisode zwangerschap -->
    <test id="5-ServeMaternalRecord">
       <name value="5-ServeMaternalRecord"/>
@@ -65,115 +33,100 @@
          <nts:with-parameter name="resource" value="EpisodeOfCare"/>
          <nts:with-parameter name="params" value="?type=http://snomed.info/sct|364320009&amp;_include=EpisodeOfCare:organization&amp;_include=EpisodeOfCare:care-manager"/>
          <nts:with-parameter name="responseId" value="fixture-5-ServeMaternalRecord"/>
-      </nts:include>   
+      </nts:include>
       <nts:include value="assert.response.numResources" scope="common" resource="EpisodeOfCare" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Organization" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Practitioner" count="1"/>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-MaternalRecord-ca7cf58a-200b-417c-acb5-8aa6a6e692d5.xml"
-                          nts:in-targets="CheckContent"/>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-MaternalRecord-f0eb00a7-6b73-11ec-0000-020000000000.xml" nts:in-targets="CheckContent"/>
    </test>
-   
-   <!-- Conditions - Problemen gerelateerd aan zorgepisode incl. zwangerschap -->
-   <test id="6-ServeConditions">
-      <name value="6-ServeConditions"/>
+
+   <!-- Conditions - Problemen gerelateerd aan zorgepisode -->
+   <test id="6a-ServeConditions">
+      <name value="6a-ServeConditions"/>
       <description value="Test Server query operation for Conditions (including Pregnancy)"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
       </nts:include>
-      <!-- Zwangerschap -->
+      <!-- bevinding betreffende zwangerschap (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Zwangerschap)"/>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende zwangerschap (bevinding)"/>
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="118185001"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-118185001-455b28f0-9ad1-41c3-bf72-89dce1086074.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=118185001))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy118185001-565cf23f-6b18-11ec-2334-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 118185001))</nts:discriminator>
       </nts:contentAsserts>
-      <!--Urineweginfectie-->
+      <!-- astma (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(urineweginfectie)"/>
+         <nts:with-parameter name="additionalDescription" value="astma (aandoening)"/>
          <nts:with-parameter name="resource" value="Condition"/>
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="code" value="307534009"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="195967001"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DisorderOfPregnancy-307534009-6cf34c3b-eff7-4eca-b4de-044d4a5ea6cc.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=307534009))</nts:discriminator>
-         <nts:discriminator>category.where(coding.code=282291009)</nts:discriminator>
-      </nts:contentAsserts>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Problem-307534009-15d62dff-ce82-441b-a869-fff08072e790.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=307534009))</nts:discriminator>
-         <nts:discriminator>category.where(coding.code=404684003)</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Problem195967001-1bf63f0f-6aa2-11ec-1291-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 195967001))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- eerstegraads perineumruptuur durante partu -->
+      <!-- toestand patiënt verslechterd -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription"
-                             value="(eerstegraads perineumruptuur durante partu)"/>
+         <nts:with-parameter name="additionalDescription" value="toestand patiënt verslechterd"/>
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="199916005"/>
+         <nts:with-parameter name="code" value="271299001"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DisorderOfLaborAndDelivery-199916005-ad8b1fbe-0c97-4672-86e4-84e9184ca0da.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=199916005))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DisorderOfLaborAndDelivery271299001-787656c8-6abd-11ec-2156-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 271299001))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- toestand van patiënt verslechterd -->
+      <!-- urineweginfectie tijdens zwangerschap (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(toestand van patiënt verslechterd)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Condition"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="271299001"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="urineweginfectie tijdens zwangerschap (aandoening)"/>
+         <nts:with-parameter name="resource" value="Condition"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="307534009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DisorderOfLaborAndDelivery-271299001-ad8b1fbe-0c97-4672-86e4-84e9184ca0da00000.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=271299001))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DisorderOfPregnancy307534009-b645daeb-6b3a-11ec-2118-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 307534009))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- Asthma -->
+      <!-- pyelonefritis (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(asthma)"/>
+         <nts:with-parameter name="additionalDescription" value="pyelonefritis (aandoening)"/>
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="195967001"/>
+         <nts:with-parameter name="code" value="45816000"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Problem-195967001-ed1da260-caf2-4a32-9eec-bee070246239.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=195967001))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Problem45816000-7fa8be61-6b2f-11ec-1291-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 45816000))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- pyelonephritis -->
+      <!-- eerstegraads perineumruptuur (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pyelonephritis)"/>
+         <nts:with-parameter name="additionalDescription" value="eerstegraads perineumruptuur (aandoening)"/>
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="45816000"/>
+         <nts:with-parameter name="code" value="57759005"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Problem-45816000-7d594516-c33f-4cb3-80c8-5e74c8a5bf68.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=45816000))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DisorderOfLaborAndDelivery57759005-d570dfa7-6b61-11ec-2156-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 57759005))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- colitis ulcerosa -->
+      <!-- colitis ulcerosa (aandoening) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(colitis ulcerosa)"/>
+         <nts:with-parameter name="additionalDescription" value="colitis ulcerosa (aandoening)"/>
          <nts:with-parameter name="resource" value="Condition"/>
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="64766004"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Problem-64766004-7e958633-3ac4-4742-9968-c7d3b52f21e9.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=64766004))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Problem64766004-06e10132-6b0c-11ec-1291-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 64766004))</nts:discriminator>
       </nts:contentAsserts>
    </test>
-   
+
    <!-- Encounters -->
    <test id="7-ServeEncounters">
       <name value="7-ServeEncounters"/>
@@ -181,10 +134,10 @@
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="Encounter"/>
          <nts:with-parameter name="params" value="?episodeofcare=EpisodeOfCare/${episode-id}&amp;_include=Encounter:practitioner"/>
-      </nts:include>    
-      <nts:include value="assert.response.numResources" scope="common" resource="Encounter" count="2"/>
+      </nts:include>
+      <nts:include value="assert.response.numResources" scope="common" resource="Encounter" count="1"/>
       <nts:include value="assert.response.numResources" scope="common" resource="Practitioner" count="1"/>
-      <!-- Prenatale controle -->
+      <!-- consult (verrichting) -->
       <nts:include value="assert.response.numResourcesWithCode" scope="common">
          <nts:with-parameter name="additionalDescription" value="(ContactSoort)"/>
          <nts:with-parameter name="codedElement" value="type"/>
@@ -192,24 +145,12 @@
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="11429006"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-Encounter-4b1f6acb-4e4d-4908-bbdc-a381aa8b4061.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>type.where(coding.code=11429006)</nts:discriminator>
-      </nts:contentAsserts>
-      <!-- patusassistentie-->
-      <nts:include value="assert.response.numResourcesWithCode" scope="common">
-         <nts:with-parameter name="additionalDescription" value="(ContactSoort)"></nts:with-parameter>
-         <nts:with-parameter name="codedElement" value="type"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Encounter"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="236973005"></nts:with-parameter>
-      </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-ChildBirthAssistance-a64685e1-7b29-489c-b94d-73c3310170ed.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>type.where(coding.code=236973005)</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-Encounter-7b035f27-6b20-11ec-1275-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 11429006))</nts:discriminator>
+         <nts:discriminator>period.start.where(value = ${DATE, T, D, -445})</nts:discriminator>
       </nts:contentAsserts>
    </test>
-   
+
    <!-- Observations - Observaties gekoppeld aan episode -->
    <test id="8a-ServeObservations">
       <name value="8a-ServeObservations"/>
@@ -218,513 +159,510 @@
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
       </nts:include>
-      <!-- lichaamslengte -->
+      <!-- [#] Parity -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(lichaamslengte)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="8302-2"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="[#] Parity"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="11977-6"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-BodyHeight-8302-2-1a76d36e-c561-4609-a560-da25f3ea09db.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='8302-2'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy-Parity11977-6-67c89ac3-6b0f-11ec-2334-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 11977-6))</nts:discriminator>
+         <nts:discriminator>value.where(value = 1)</nts:discriminator>
       </nts:contentAsserts>
-      <!-- pregnancy duration -->
+      <!-- [#] Pregnancies -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pregnancy duration)"/>
+         <nts:with-parameter name="additionalDescription" value="[#] Pregnancies"/>
          <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="code" value="57036006"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="11996-6"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-PregnancyDuration-57036006-229d4cef-8921-45e9-a5d7-23b2d3090011.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='57036006'))</nts:discriminator>
-         <nts:discriminator>value.where(value='59')</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy-Gravidity11996-6-ba5d6097-6b0b-11ec-2334-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 11996-6))</nts:discriminator>
+         <nts:discriminator>value.where(value = 2)</nts:discriminator>
       </nts:contentAsserts>
-      <!-- todo: discriminator is nog niet specifiek genoeg -->
-<!--      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-PregnancyDuration-57036006-0a1ff6b2-bc42-4967-b48b-84d333560117.xml"
-         nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=57036006))</nts:discriminator>
-         <nts:discriminator>value.where(value='279')</nts:discriminator>
+      <!-- Body mass index (BMI) [Ratio] -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="Body mass index (BMI) [Ratio]"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="39156-5"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
+      </nts:include>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-MaternalObservation39156-5-1fe6b9a2-6b0b-11ec-2342-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 39156-5))</nts:discriminator>
+         <nts:discriminator>value.where(value = 24.2)</nts:discriminator>
       </nts:contentAsserts>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-PregnancyDuration-57036006-404eb538-f8c3-4637-bdb0-37e9c4ec4ca6.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code=57036006))</nts:discriminator>
-         <nts:discriminator>value.where(value='279')</nts:discriminator>
-      </nts:contentAsserts>-->
-      <!-- pariteit-->
+      <!-- Body height -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(parity)"/>
+         <nts:with-parameter name="additionalDescription" value="Body height"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="11977-6"/>
+         <nts:with-parameter name="code" value="8302-2"/>
          <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-Parity-11977-6-fc075697-750b-4d3d-8376-c93f58d8bdfd.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='11977-6'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-BodyHeight8302-2-29075b0f-6b4e-11ec-2166-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 8302-2))</nts:discriminator>
+         <nts:discriminator>value.where(value = 170)</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -445})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- Graviditeit -->
+      <!-- Datum van laatste menstruatie [datum] -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(gravidity)"/>
+         <nts:with-parameter name="additionalDescription" value="Datum van laatste menstruatie [datum]"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="11996-6"/>
+         <nts:with-parameter name="code" value="8665-2"/>
          <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-Gravidity-11996-6-a91713db-aded-43ce-b54b-9a85c3eb9aa7.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='11996-6'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy-DateLastMenstruation8665-2-3beb7505-6aef-11ec-2335-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 8665-2))</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -444})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- a terme datum -->
+      <!-- datum van einde van zwangerschap (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(a terme datum)"/>
+         <nts:with-parameter name="additionalDescription" value="datum van einde van zwangerschap (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="147781000146105"/>
+         <nts:with-parameter name="code" value="118951000146109"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-PregnancyObservation-147781000146105-0d7ad790-3026-465a-951d-8ad81726c216.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='147781000146105'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PregnancyObservation118951000146109-61a10eb8-6aea-11ec-2172-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 118951000146109))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- voorgeschiedenis abortus -->
+      <!-- datum en tijd van geboorte van placenta (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(voorgeschiedenis abortus)"/>
+         <nts:with-parameter name="additionalDescription" value="datum en tijd van geboorte van placenta (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="713651007"/>
+         <nts:with-parameter name="code" value="136311000146100"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+      </nts:include>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation136311000146100-d6fda78b-6aeb-11ec-2423-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 136311000146100))</nts:discriminator>
+      </nts:contentAsserts>
+      <!-- voorkeur voor locatie van bevalling (waarneembare entiteit) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="voorkeur voor locatie van bevalling (waarneembare entiteit)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="142961000146102"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-PregnancyObservation-713651007-afd448c4-06a0-4198-9842-0ff5a98df1a0.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='713651007'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-MaternalObservation142961000146102-04851afc-6b40-11ec-2225-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 142961000146102))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 264362003))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- aantal levende nakomelingen -->
+      <!-- aantal levende nakomelingen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(aantal levende nakomelingen)"/>
+         <nts:with-parameter name="additionalDescription" value="aantal levende nakomelingen (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="143881000146107"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-PregnancyObservation-143881000146107-c8696978-2fa3-4a65-a091-b5054b6dc584.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='143881000146107'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PregnancyObservation143881000146107-c2371ac3-6b52-11ec-2173-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 143881000146107))</nts:discriminator>
+         <nts:discriminator>value.where(value = 1)</nts:discriminator>
       </nts:contentAsserts>
-      <!-- datum einde zwangerschap -->
+      <!-- definitieve uitgerekende datum van partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(datum einde zwangerschap)"/>
+         <nts:with-parameter name="additionalDescription" value="definitieve uitgerekende datum van partus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="118951000146109"/>
+         <nts:with-parameter name="code" value="147781000146105"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-PregnancyObservation-118951000146109-85071e45-6439-4214-9b38-9738bb21891b.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='118951000146109'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PregnancyObservation147781000146105-9269ecf3-6b11-11ec-2222-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 147781000146105))</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -444})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- voorkeur plaats bevalling -->
+      <!-- manier waarop eerste fase van partus is begonnen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(voorkeur plaats bevalling)"/>
+         <nts:with-parameter name="additionalDescription" value="manier waarop eerste fase van partus is begonnen (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="142961000146102"/>
+         <nts:with-parameter name="code" value="160611000146102"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-MaternalObservation-142961000146102-80620673-c115-425f-8f9f-6e965a1754a2.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='142961000146102'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation160611000146102-cd876e13-6ab8-11ec-2409-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 160611000146102))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 236958009))</nts:discriminator>
       </nts:contentAsserts>
-      <!--perinatale sterfte -->
+      <!-- datum van begin van eerste fase van partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(perinatale sterfte)"/>
+         <nts:with-parameter name="additionalDescription" value="datum van begin van eerste fase van partus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="276507005"/>
+         <nts:with-parameter name="code" value="160621000146107"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <!-- tijdstip breken vliezen -->
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation160621000146107-454a2d13-6a9c-11ec-2408-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 160621000146107))</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -226})</nts:discriminator>
+      </nts:contentAsserts>
+      <!-- geschatte datum van partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tijdstip breken vliezen)"/>
+         <nts:with-parameter name="additionalDescription" value="geschatte datum van partus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="289251005"/>
+         <nts:with-parameter name="code" value="161714006"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-289251005-d456764f-200f-4e6a-83c7-e792a4826c8d.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='289251005'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PregnancyObservation161714006-dbfceeb8-6b47-11ec-2334-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 161714006))</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -444})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- datum begin actieve ontsluiting -->
+      <!-- voorgeschiedenis met eerdere zwangerschap met intra-uteriene foetale dood (situatie) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(datum begin actieve ontsluiting)"/>
+         <nts:with-parameter name="additionalDescription" value="voorgeschiedenis met eerdere zwangerschap met intra-uteriene foetale dood (situatie)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="160621000146107"/>
+         <nts:with-parameter name="code" value="16216731000119106"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-160621000146107-c1c59f51-170e-4b8d-9a85-b2fdaab4f770.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='160621000146107'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PregnancyObservation16216731000119106-568b74ef-6b1b-11ec-2181-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 16216731000119106))</nts:discriminator>
+         <nts:discriminator>value.where(value = 0)</nts:discriminator>
       </nts:contentAsserts>
-      <!-- aard vruchtwater -->
+      <!-- aspect van vruchtwater (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(aard vruchtwater)"/>
+         <nts:with-parameter name="additionalDescription" value="aspect van vruchtwater (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="366334007"/>
+         <nts:with-parameter name="code" value="168089007"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-366334007-cba76941-3e90-4b7a-815e-343cf787bced.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='366334007'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation168089007-b3d83f0b-6b76-11ec-2412-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 168089007))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 168090003))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- geboorteplaats-->
+      <!-- geboorte van placenta (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(geboorteplaats)"/>
+         <nts:with-parameter name="additionalDescription" value="geboorte van placenta (verrichting)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="366344009"/>
+         <nts:with-parameter name="code" value="236994008"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-BirthObservation-366344009-b8ac8945-052d-41ae-9f59-544810ca8234.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='366344009'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation236994008-2c9c7a0f-6add-11ec-2421-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 236994008))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 408819007))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- type partus -->
+      <!-- begin van persen tijdens partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(type partus)"/>
+         <nts:with-parameter name="additionalDescription" value="begin van persen tijdens partus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="364336006"/>
+         <nts:with-parameter name="code" value="249163006"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-BirthObservation-364336006-32f99a53-7591-4dba-a722-75beab3a68b7.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='364336006'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-BirthObservation249163006-5e5b3d16-6ab9-11ec-2413-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 249163006))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- bloedverlies -->
+      <!-- aantal bloedvaten in navelstreng (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloedverlies)"/>
+         <nts:with-parameter name="additionalDescription" value="aantal bloedvaten in navelstreng (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="364332008"/>
+         <nts:with-parameter name="code" value="249191003"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-364332008-4a627038-a724-4034-8806-bf98af74e0e4.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='364332008'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation249191003-832a4629-6b23-11ec-2429-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 249191003))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 29691000146104))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- ligging kind bij geboorte -->
+      <!-- presenterend deel van foetus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(ligging kind bij geboorte)"/>
+         <nts:with-parameter name="additionalDescription" value="presenterend deel van foetus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="271692001"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-BirthObservation-271692001-8c861b3a-0f4a-46f7-bec4-d5d0de06deae.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='271692001'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-FetusObservation271692001-5dd887ab-6b2f-11ec-2416-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 271692001))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 37235006))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- tijdstip actief meepersen -->
+      <!-- tijdstip waarop gebroken vliezen zijn geconstateerd (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tijdstip actief meepersen)"/>
+         <nts:with-parameter name="additionalDescription" value="tijdstip waarop gebroken vliezen zijn geconstateerd (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="249163006"/>
+         <nts:with-parameter name="code" value="289251005"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-BirthObservation-249163006-0c08fb83-823f-46d8-be88-e00b85f7211e.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='249163006'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation289251005-79f3bfeb-6b1b-11ec-2410-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 289251005))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- conditie perineum-->
+      <!-- bloedverlies durante partu (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(conditie perineum)"/>
+         <nts:with-parameter name="additionalDescription" value="bloedverlies durante partu (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="364297003"/>
+         <nts:with-parameter name="code" value="364332008"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-364297003-3846fc33-a17b-4002-bad1-d728ec83ba6d.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='364297003'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation364332008-2ed14cf4-6b34-11ec-2396-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 364332008))</nts:discriminator>
+         <nts:discriminator>value.where(value = 615)</nts:discriminator>
       </nts:contentAsserts>
-      <!-- geboorte placenta -->
+      <!-- soort partus (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(geboorte placenta)"/>
+         <nts:with-parameter name="additionalDescription" value="soort partus (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="236994008"/>
+         <nts:with-parameter name="code" value="364336006"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-236994008-f7e02224-1c2c-4104-9eeb-996b9f0d1d14.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='236994008'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-BirthObservation364336006-fecbefa3-6b67-11ec-2414-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 364336006))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 48782003))</nts:discriminator>
       </nts:contentAsserts>
-      <!--rhesus C-->
+      <!-- compleetheid van placenta (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(rhesus c)"/>
+         <nts:with-parameter name="additionalDescription" value="compleetheid van placenta (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="1159-3"/>
-         <nts:with-parameter name="system" value="http://loinc.org"/>
+         <nts:with-parameter name="code" value="364343000"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-LaboratoryTestResult-Observation-1159-3-73e45b34-0fc7-4dae-b0f5-271a4fda7b53.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='1159-3'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation364343000-b02d12f7-6b47-11ec-2424-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 364343000))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 249170006))</nts:discriminator>
       </nts:contentAsserts>
-      <!--Rhesus D-->
+      <!-- compleetheid van vruchtvliezen (waarneembare entiteit) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(rhesus d)"/>
+         <nts:with-parameter name="additionalDescription" value="compleetheid van vruchtvliezen (waarneembare entiteit)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="1305-2"/>
-         <nts:with-parameter name="system" value="http://loinc.org"/>
+         <nts:with-parameter name="code" value="364351002"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+      </nts:include>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryObservation364351002-ea91873b-6b13-11ec-2427-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 364351002))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 249181009))</nts:discriminator>
+      </nts:contentAsserts>
+      <!-- bevinding betreffende locatie van partus -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende locatie van partus"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="366344009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-LaboratoryTestResult-Observation-1305-2-df436146-56f2-4717-8797-70ed7686a04a.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='1305-2'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-BirthObservation366344009-7ad21437-6a97-11ec-2419-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 366344009))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 56311000146108))</nts:discriminator>
       </nts:contentAsserts>
-      <!--bloedgroep-->
+      <!-- zwangerschapsduur -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloedgroep)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="883-9"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://loinc.org"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="zwangerschapsduur"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="code" value="57036006"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-LaboratoryTestResult-Observation-883-9-dcfa568d-c18d-428c-a71e-dd7924f22c65.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='883-9'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy-PregnancyDuration57036006-2ea20e79-6b24-11ec-2702-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>value.where(value = 59)</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -445})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- wijze Begin Baring -->
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-Pregnancy-PregnancyDuration57036006-812c4d63-6aa9-11ec-2334-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>value.where(value = 279)</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -225})</nts:discriminator>
+      </nts:contentAsserts>
+      <!-- bevinding betreffende bekkenregio van romp (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(wijze Begin Baring)"></nts:with-parameter>
-         <nts:with-parameter name="resource" value="Observation"></nts:with-parameter>
-         <nts:with-parameter name="count" value="1"></nts:with-parameter>
-         <nts:with-parameter name="code" value="160611000146102"></nts:with-parameter>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"></nts:with-parameter>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende bekkenregio van romp (bevinding)"/>
+         <nts:with-parameter name="resource" value="Observation"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="609625009"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryObservation-160611000146102-d227a57f-b582-44b0-a1ea-dddaa5a1d971.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='160611000146102'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-PerinealAssessment609625009-684ffb15-6aaa-11ec-2395-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 609625009))</nts:discriminator>
       </nts:contentAsserts>
    </test>
-   
+
    <!-- Observations - Observaties gekoppeld aan prenatale controle -->
    <test id="8b-ServeObservations">
       <name value="8b-ServeObservations"/>
-      <description value="Test Server query operation for Observations"/>  
+      <description value="Test Server query operation for Observations"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="params" value="?context:Encounter.episodeofcare=EpisodeOfCare/${episode-id}"/>
-      </nts:include>  
-      <!-- alcoholgebruik -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(alcohol use)"/>
-         <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="228273003"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-AlcoholUse-228273003-aa1568db-ca79-4f9e-b84f-9c170ff1bfa2.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='228273003'))</nts:discriminator>
-      </nts:contentAsserts>
-      <!-- tabak -->
+      <!-- Lichaamsgewicht [massa] -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(tobacco use)"/>
+         <nts:with-parameter name="additionalDescription" value="Lichaamsgewicht [massa]"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="365980008"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+         <nts:with-parameter name="code" value="29463-7"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-TobaccoUse-365980008-4bc66ba3-de85-4c64-9237-981ec90c8f66.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='365980008'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-BodyWeight29463-7-7365c49b-6ace-11ec-2107-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 29463-7))</nts:discriminator>
+         <nts:discriminator>value.where(value = 70)</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -445})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- drugs -->
+      <!-- Bloeddruk panel waarvan alle leden optioneel in arterieel vaatstelsel -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(drug use)"/>
+         <nts:with-parameter name="additionalDescription" value="Bloeddruk panel waarvan alle leden optioneel in arterieel vaatstelsel"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="228366006"/>
-         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
+         <nts:with-parameter name="code" value="85354-9"/>
+         <nts:with-parameter name="system" value="http://loinc.org"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-DrugUse-228366006-6afb07e2-e295-4f1c-9159-f217e5eac87b.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='228366006'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-BloodPressure85354-9-21f4f183-6aa4-11ec-2106-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 85354-9))</nts:discriminator>
+         <nts:discriminator>effectiveDateTime.where(value = ${DATE, T, D, -445})</nts:discriminator>
       </nts:contentAsserts>
-      <!-- pregnancy duration-->
+      <!-- bevinding betreffende alcoholgebruik (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(pregnancy duration)"/>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende alcoholgebruik (bevinding)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="57036006"/>
+         <nts:with-parameter name="code" value="228273003"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Pregnancy-PregnancyDuration-57036006-fddae8ee-be6a-4b2f-83a1-ac0c55fd96ae.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='57036006'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-AlcoholUse228273003-00b2da4e-6b30-11ec-1212-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 228273003))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 105542008))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- foetale beweging -->
+      <!-- bevinding betreffende drugsgebruik (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(foetale beweging)"/>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende drugsgebruik (bevinding)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="364618000"/>
+         <nts:with-parameter name="code" value="228366006"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-PregnancyObservation-364618000-35a5aaa2-2359-474a-974d-e0e775ad415c.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='364618000'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-DrugUse228366006-f3ac1e80-6b09-11ec-1211-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 228366006))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 228367002))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- lichaamsgewicht-->
+      <!-- bevinding betreffende tabakgebruik en blootstelling aan tabaksrook (bevinding) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(lichaamsgewicht)"/>
+         <nts:with-parameter name="additionalDescription" value="bevinding betreffende tabakgebruik en blootstelling aan tabaksrook (bevinding)"/>
          <nts:with-parameter name="resource" value="Observation"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="29463-7"/>
-         <nts:with-parameter name="system" value="http://loinc.org"/>
+         <nts:with-parameter name="code" value="365980008"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-BodyWeight-29463-7-86e9dcc3-58a3-4a01-8ff7-b5d93f1ce3ab.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='29463-7'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-zib-TobaccoUse365980008-edfa0f8f-6b43-11ec-2224-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 365980008))</nts:discriminator>
+         <nts:discriminator>value.where(coding.where(code = 266919005))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- bloeddruk -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(bloeddruk)"/>
-         <nts:with-parameter name="resource" value="Observation"/>
-         <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="85354-9"/>
-         <nts:with-parameter name="system" value="http://loinc.org"/>
-      </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-BloodPressure-85354-9-aa149af9-b2c3-4487-a9c9-05f41d9f08c4.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='85354-9'))</nts:discriminator>
-      </nts:contentAsserts> 
    </test>
-   
+
    <!-- Alle verrichtingen -->
    <test id="9-ServeProcedures">
       <name value="9-ServeProcedures"/>
-      <description value="Test Server query operation for (Obstetric) Procedures"/>
+      <description value="Query Procedure resource for HCIM Procedures"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="Procedure"/>
-         <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}&amp;_include=Procedure:performer&amp;_include=Procedure:based-on"/>
-      </nts:include>   
-      <nts:include value="assert.response.numResources" scope="common" resource="Procedure" count="5"/>
-      <nts:include value="assert.response.numResources" scope="common" resource="Organization" count="0"/>
-      <nts:include value="assert.response.numResources" scope="common" resource="ProcedureRequest" count="0"/>
-      <!-- Verrichting (Bevalling) -->
-      <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Bevalling)"/>
+      </nts:include>
+      <nts:include value="assert.response.numResources" scope="common">
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="6"/>
+         <nts:with-parameter name="atLeast"/>
+      </nts:include>
+      <!-- operatie van bewegingsapparaat (verrichting) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="operatie van bewegingsapparaat (verrichting)"/>
          <nts:with-parameter name="resource" value="Procedure"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="236973005"/>
+         <nts:with-parameter name="code" value="112697007"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-DeliveryProcedure-236973005-1b451eb2-4ad8-4291-9bb7-5124ec9f9957.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='236973005'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-ObstetricProcedure112697007-07492dbf-6aa7-11ec-2108-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 112697007))</nts:discriminator>
       </nts:contentAsserts>
-      <!--geboorte -->
+      <!-- operatie van vrouwelijk geslachtsorgaan (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Geboorte)"/>
+         <nts:with-parameter name="additionalDescription" value="operatie van vrouwelijk geslachtsorgaan (verrichting)"/>
          <nts:with-parameter name="resource" value="Procedure"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="3950001"/>
+         <nts:with-parameter name="code" value="12658000"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-Birth-3950001-1560263e-ed1b-4ce5-8d19-cd9e3b4783b0.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='3950001'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-ObstetricProcedure12658000-dbfbda17-6ab3-11ec-2108-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 12658000))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- strippen vliezen -->
+      <!-- strippen van vliezen (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Strippen vliezen)"/>
+         <nts:with-parameter name="additionalDescription" value="strippen van vliezen (verrichting)"/>
          <nts:with-parameter name="resource" value="Procedure"/>
          <nts:with-parameter name="count" value="1"/>
          <nts:with-parameter name="code" value="236960006"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-bc-ObstetricProcedure-236960006-5043a2f3-0fe1-4b98-8d1e-57b2d2941ec6.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='236960006'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-ObstetricProcedure236960006-7e6e4e27-6ae1-11ec-2154-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 236960006))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- operatie van bewegingsaparaat -->
+      <!-- verlossing (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription" value="(Operatie van bewegingsapparaat)"/>
+         <nts:with-parameter name="additionalDescription" value="verlossing (verrichting)"/>
          <nts:with-parameter name="resource" value="Procedure"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="112697007"/>
+         <nts:with-parameter name="code" value="236973005"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Procedure-112697007-ccf17734-1767-4208-9f67-2cda23d946a3.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='112697007'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-DeliveryProcedure236973005-44fcd4ef-6b10-11ec-2123-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 236973005))</nts:discriminator>
       </nts:contentAsserts>
-      <!-- operatie vrouwelijk geslachtsorgaan-->
+      <!-- echografie van foetus (verrichting) -->
       <nts:include value="gbz-assert-returnCountWithCode">
-         <nts:with-parameter name="additionalDescription"
-                             value="(Operatie van vrouwelijk geslachtsorgaan)"/>
+         <nts:with-parameter name="additionalDescription" value="echografie van foetus (verrichting)"/>
          <nts:with-parameter name="resource" value="Procedure"/>
          <nts:with-parameter name="count" value="1"/>
-         <nts:with-parameter name="code" value="12658000"/>
+         <nts:with-parameter name="code" value="241491007"/>
          <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-Procedure-12658000-7f511c12-04e8-4e03-bf1e-35af995d3594.xml"
-                          nts:in-targets="CheckContent">
-         <nts:discriminator>code.where(coding.where(code='12658000'))</nts:discriminator>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-ObstetricProcedure241491007-4303593f-6aec-11ec-2119-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 241491007))</nts:discriminator>
       </nts:contentAsserts>
-   </test>
-   
-   <!-- Zorgteam -->
-   <test id="10-ServeCareTeam">
-      <name value="10-ServeCareTeam"/>
-      <description value="Test Server query operation for CareTeam"/>  
-      <nts:include value="medmij/test.xis.successfulSearch" scope="common">
-         <nts:with-parameter name="resource" value="CareTeam"/>
-         <nts:with-parameter name="params" value="?context=EpisodeOfCare/${episode-id}"/>
-      </nts:include>    
-      <nts:include value="assert.response.numResources" scope="common">
-         <nts:with-parameter name="resource" value="CareTeam"/>
-         <nts:with-parameter name="count" value="0"/>
+      <!-- geboorte (bevinding) -->
+      <nts:include value="gbz-assert-returnCountWithCode">
+         <nts:with-parameter name="additionalDescription" value="geboorte (bevinding)"/>
+         <nts:with-parameter name="resource" value="Procedure"/>
+         <nts:with-parameter name="count" value="1"/>
+         <nts:with-parameter name="code" value="3950001"/>
+         <nts:with-parameter name="system" value="http://snomed.info/sct"/>
       </nts:include>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-Birth3950001-e95374d3-6b68-11ec-2123-020000000000.xml" nts:in-targets="CheckContent">
+         <nts:discriminator>code.where(coding.where(code = 3950001))</nts:discriminator>
+         <nts:discriminator>performedDateTime.where(value = ${DATE, T, D, -225})</nts:discriminator>
+      </nts:contentAsserts>
    </test>
-   
+
    <!-- Consent -->
-   <test id="11-ServeConsent">
-      <name value="11-ServeConsent"/>
-      <description value="Test Server query operation for Consent"/>  
+   <test id="12-ServeConsent">
+      <name value="12-ServeConsent"/>
+      <description value="Test Server query operation for Consent"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="Consent"/>
-      </nts:include>    
+      </nts:include>
       <nts:include value="assert.response.numResources" scope="common">
          <nts:with-parameter name="resource" value="Consent"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-zib-TreatmentDirective-4ddf57ee-8093-4ec4-bf78-857f40965d53.xml"
-         nts:in-targets="CheckContent"/>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-bc-TreatmentDirective-c-TreatmentDirective-mm-gbz-ccee86c4-6b5f-11ec-1040-020000000000.xml" nts:in-targets="CheckContent"/>
    </test>
-   
+
    <!-- RelatedPerson -->
-   <test id="12-RelatedPerson">
-      <name value="12-RelatedPerson"/>
-      <description value="Test Server query operation for RelatedPerson"/>  
+   <test id="13-RelatedPerson">
+      <name value="13-RelatedPerson"/>
+      <description value="Test Server query operation for RelatedPerson"/>
       <nts:include value="medmij/test.xis.successfulSearch" scope="common">
          <nts:with-parameter name="resource" value="RelatedPerson"/>
-      </nts:include>    
+      </nts:include>
       <nts:include value="assert.response.numResources" scope="common">
          <nts:with-parameter name="resource" value="RelatedPerson"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:contentAsserts href="Verloskunde-Casus1/medmij-gbz-nl-core-relatedperson-180ff317-c7cf-4ab6-8a57-9f989cc5c600.xml"
-         nts:in-targets="CheckContent"/>
+      <nts:contentAsserts href="Verloskunde-Casus1/mm-gbz-nl-core-relatedperson-relatedperson-mm-gbz-MOHAMMEDMELKADDOURI.xml" nts:in-targets="CheckContent"/>
    </test>
+
 </TestScript>