diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
index 8413dcd620..237da498a1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
index fa19a4c637..7fce3d1b67 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml
index f082878b66..3d08e13d35 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
index 6cface48e2..467ef37193 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
index e1adb03fab..9a341d0423 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -27,16 +27,14 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
-       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
index 3170013082..a80dc54783 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
index 56ed6af5db..fa1cefd54b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
index e043a7ff70..a3b9092f32 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
index 10003fb1ad..adfeafd88e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
index 5c451b8708..070846e1fe 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
index 260344cde8..2a80e91f3a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml
index 157fd43bfd..4277093b4b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml
index 6c2dea57ea..2300a5bb8d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
index fdcbce7ae1..409ae8ff27 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml
index de6225b2cb..25a385d33b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="8"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 8 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
index 1ae826742a..08f3c92258 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
index 8cc55789d5..dedb47e06b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml
index da689c7708..ae73e87f9a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
index 652ea6b6c3..9a88f25228 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
index 9a779d7e03..261c8b75c6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
@@ -27,16 +27,14 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|52711000146108&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:requester&amp;_include=MedicationRequest:dispense-location&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
-       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!--<nts:include value="assert-returnCount" scope="project">
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
index 82a84be7a2..c5c2a89d10 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
index 8ead45cb04..f18d07d5f0 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml
index 55afa726e7..5396f32013 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml
index 2c8d041db6..759fad7bca 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml
index 0ebafa0c55..4d690a0205 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml
index 6077bcdc0e..006576c469 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
index 956f66ca81..e035d0fd5f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
index 4b53ebccb8..467b202254 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="12"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="15"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 12 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
index 7a165dd9ae..a78d5e65d4 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml
index fc9a2645fa..7228b9ac91 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 1878c810f5..9984a034c1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-18}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="7"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
index 0b83fbb0c8..93467c93c2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=le${DATE, T, D,-21}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
index 6460a73c76..1e5bb9a16d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|18629005&amp;effective-time=ge${DATE, T, D,-23}&amp;effective-time=le${DATE, T, D,-11}&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
index d6d8165e0d..e6318993e8 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml
index e8c204b1dd..78e5929043 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
index bedbe56f80..ff1ee6f6ff 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml
index 26ba6acd7e..d38135cc2c 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml
index f6277e8da9..248c7edb84 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
index bf0e425e14..ca056fffb5 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml
index cb709cb3fc..087a6f4842 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset8.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
index 42bfbedc2a..a3b6e9e337 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
index f0de2a3166..703d2c6038 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml
index 2f2f7dd032..aef0f8e38b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
index 5075fd100b..97ce6caa6e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
index 2f07538621..d5341993ec 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=lt${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
index 607beab165..c83e599ec1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
index 06b3aada52..ecb0bc286d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
index ce32124604..ebf2f3040d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
index 19b96a572a..e13d69e4fa 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
index b5cafb689b..bb8bcae0fa 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
index df6d2ce286..b8bb0048c6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml
index 6d369bff1a..93b08789bd 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml
index a1d274953a..620689f19f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
index 341ba96720..0c79f6c983 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
index 68be938a2d..e828cb2c4e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml
index 46e846a46f..e035b99e02 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset8.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml
index 24b5e99d3f..cae4762323 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
index 7df75c4ed0..61310329a5 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
index 3d1220d0de..52febd426b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml
index 329587b981..57d8553cd4 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
index 4e1902d8b2..cd63b2d036 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-18}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
index a609b0bb2a..052d70cad1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=le${DATE, T, D,-13}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
index 8ff338a400..e3f409a6f2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-14}&amp;whenhandedover=le${DATE, T, D,-11}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
index d1a331c0e4..0fddf00be3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
index bb86ec7a5e..dc92e9d7dd 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
index 1a9ae1cdd3..f3b02a2ad8 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
index f8adcd282f..db45804922 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml
index 387f802156..9666f8a1b3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml
index 25ce5fb6c6..85840861a1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml
index 58998620f6..e9dedba8f9 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml
index 4f40fce596..b2e6865998 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
index 7f8c1b637f..acddf7c0e1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
index 0b4f751807..b2b41d980d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
index da9074df04..dad5650fc2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml
index 7a6509400d..ac98ff759f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
index db2521350e..6e453a9834 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-6}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
index 7acf04d1db..3ef611ecf3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=le${DATE, T, D,-13}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
index d7e8520249..b4fa649f88 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-14}&amp;period-of-use=le${DATE, T, D,-11}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
index 90d8197bf8..919a37da1a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
index 09d66b80b4..449ef48231 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
index b3c97b293c..daa8405425 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
index 0962645a6d..f47dbedeee 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml
index 7eb9ff0cc4..639fd2b4ea 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
index c634d74080..664e326907 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml
index da20c7848f..2916855942 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index 7221445bd1..ff81855a22 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -27,15 +27,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index 539b074f30..7e6f357603 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -32,15 +32,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
index 3967ed874a..03e6418926 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index b935efb0d6..373d9fa026 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-10}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index 1def4bbcb7..65f977db7e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=lt${DATE, T, D,-14}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index cc903ab33b..238ff5deb9 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-16}&amp;period-of-use=le${DATE, T, D,-9}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index 7f7c42b4e6..6db688537c 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -32,15 +32,13 @@
                              value="?category=http://snomed.info/sct|395067002&amp;pharmaceutical-treatment-identifier=${filter-identifier}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> 
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include>-->
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
index 2bed89dee3..7ce8c8d8ab 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
index 3d95d0442d..9f1385c743 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
index 75c9aa73a2..2ec7e89c2b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
index 4e485933fa..fa80d7e3fb 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
index 27ab12ecb9..dcc7661e8d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3.xml
index b340020ea9..0875c5fb7b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
index 69f45a6800..20a2039f81 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
index 23e6df8e52..e60e599bf4 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->     
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
index 04ba67ba19..8df9b3bc74 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
index 9a996dc312..886f64ab7a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
index 8d42ea8fa4..a0ca0c0e57 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
index 385508bb99..412c7c2443 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
index 40fc72ad50..5131728b62 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
index e8604bd530..4ea8991701 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4.xml
index 38a1297969..5b306fcbfe 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5.xml
index 7512c5204d..02985735ca 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
index c65aa9f658..321630dbb3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9.xml
index 7fa44444a1..77fbc18f0e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="8"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 8 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
index 4e08d22b1c..0a331de084 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
index 3b169afc79..59dd0bb5b8 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3.xml
index 59667d9ba0..c40a16b40a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
index 23b3312866..70acf8d0de 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
index 7cb742d8b8..f3fe7ffc2f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
index 59655a3053..f0eca8e9bb 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
index fe2e671cdd..8e3c32e6ab 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3.xml
index cd99dbb22f..83348ca881 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4.xml
index 318712ca1f..1293b10e50 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5.xml
index 484c9bebe5..71e1d2eb13 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6.xml
index cc24b661d7..56efaaf027 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
index 3386311a1e..6ea8cd0904 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
index 3a5f941e89..d334c5436f 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="12"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="15"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 12 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
index 0575c0eb56..25ca617daa 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3.xml
index d81dfbdcde..e1fb7ab5eb 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 1fe913d593..11210c4714 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="7"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
index 9f8d361e06..7ff0bcda68 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 1 Medication resources.)"/>
-      </nts:include> 
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
index cf0da7306a..a25473e564 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationAdministration and 3 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
index 248179c035..f8d1d2eff6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1.xml
index 875383c1dc..bb8d166e64 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
index 0d8585693f..494115a1b0 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4.xml
index c159f7fd9f..2d0c048180 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5.xml
index 24c18f73b0..7732cf973a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
index dae57de5be..0e63223914 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8.xml
index 0b8e82b55c..0aa6aa6421 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset8.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
index ac3ce83def..d7b6787a8b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
index db5f50f8cb..0c8376382b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3.xml
index 828fb419d9..55c4f8913d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
index e0d839b3e3..240ef3b48a 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
index 509e24d988..4338326a77 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
index b469245008..f58616eaa2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
index 078f99253a..64d8b7f0ea 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
index e01d3b45ff..e62be677b2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
index 104765e834..485a663b36 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
index 5abe8480a1..5c3b47e4d3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
index 39d8c140c3..66bbc7251c 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4.xml
index 18fed444e1..5407691d08 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5.xml
index 96d557b451..f1f2fa081b 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
index a416fa765b..9cf06e7879 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
index 0e71224c25..c2961459a3 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8.xml
index c961adab0b..81f75d60cd 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset8.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9.xml
index 0670f11915..e88a749ce6 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
index 72edbd28a9..a034b9d4b9 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
index 137bf4d99d..1670192c4e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3.xml
index f73f580184..e77ab00412 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
index dacbbd1911..118e1e8481 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
index 05f8135769..f4acccba48 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
index c994e2b717..7277bafbfd 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
index 74526392b4..7d3fbb8717 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
index a382cb7a55..e4ac4dfb87 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
index cc83108d09..c265d21a76 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
index d07a7f286d..b145136238 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset3.xml
index e0836b9f5f..d5dcaae848 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset4.xml
index 504c4a7beb..c2f54e4cef 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset5.xml
index 55ebf7fbbe..317d8f5c09 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset6.xml
index 81b24d3bd0..2d951124b0 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
index 3ba0ed1f0e..a487064db2 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
index 183171d31d..6488a922f1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
index c452f15132..6bb2b69b13 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3.xml
index a9173c5053..2553ca20c7 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
index 5b343c6754..d72f78e653 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
index 5ce36dfb99..01e666cfad 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
index fef1f990a3..4182933f6d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
index 4c62e88967..984af6bed9 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
index 6c3bf87256..9d7d284699 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
index c1616d0bc8..05d36435f5 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
index e66536ef6a..dc26e75a5d 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCountAtLeast" scope="project">
+      <nts:include value="assert-returnCountAtLeast" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset3.xml
index bd9fa4e3dd..33abffedb5 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
index 282b9f3238..596a5ca8aa 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset9.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset9.xml
index 44a3c0a462..3ed3c36212 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index 689f0466ab..675ea1ffa8 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -28,15 +28,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index 39b8fc9601..419c8107a1 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -33,15 +33,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
index 6fba30bdd0..4ba46fc4ef 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 01c14b7774..7900160fbc 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index aa9dab34eb..09c7377ea4 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index 0ee6b66d7c..38fed2eeda 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index e754ff00c6..e810d4f31e 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -33,15 +33,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
-      </nts:include> 
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
-      </nts:include>-->
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
index 4474b7b5b2..b1bcdb1358 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
index b725bdef7b..615b3aaa65 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
index b7ba28c04a..df0c1abcef 100644
--- a/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Cert/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Receiving-System/MA-Scenario13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Receiving-System/MA-Scenario13.xml
new file mode 100644
index 0000000000..35e0ceb77e
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Receiving-System/MA-Scenario13.xml
@@ -0,0 +1,44 @@
+<TestScript xmlns="http://hl7.org/fhir"
+            xmlns:nts="http://nictiz.nl/xsl/testscript"
+            nts:scenario="server">
+   <id value="mp9-meddata-receive-13-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="MP9 - Server - Scenario 13.x - Receive MedicationData - MA-Scenario13"/>
+   <description value="Scenario 13.x - Receive MedicationData for H. XXX_Hoek."/>
+   <nts:fixture id="mgsets-mp-smg-tst-MA-Scenario13-v30"
+                href="fixtures/mgsets-mp-smg-tst-MA-Scenario13-v30.{$_FORMAT}"/>
+   <nts:includeDateT value="yes"/>
+   <test id="scenario13-x-receive-meddata">
+      <name value="Scenario 13.x"/>
+      <description value="Receive MedicationData in a transaction Bundle"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://terminology.hl7.org/CodeSystem/testscript-operation-codes"/>
+               <code value="transaction"/>
+            </type>
+            <description value="Test server to handle a Bundle of type transaction."/>
+            <contentType value="{$_FORMAT}"/>
+            <destination value="1"/>
+            <origin value="1"/>
+            <requestHeader>
+               <field value="Prefer"/>
+               <value value="return=representation"/>
+            </requestHeader>
+            <sourceId value="mgsets-mp-smg-tst-MA-Scenario13-v30"/>
+         </operation>
+      </action>
+      <nts:include value="assert.response.success" scope="common"/>
+      <nts:include value="assert.response.bundleContent"
+                   scope="common"
+                   bundleType="transaction-response"/>
+      <nts:include value="assert.request.numResources"
+                   scope="common"
+                   resource="MedicationRequest"
+                   count="1"/>
+      <nts:include value="assert.request.numResources"
+                   scope="common"
+                   resource="Medication"
+                   count="1"/>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12L.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12L.xml
index 38ee3f1485..d7f0b4e48b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12L.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12L.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12a.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12a.xml
index 0c70d751bd..6e627a5dce 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12a.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12a.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="20"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="30"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 20 MedicationDispense and 10 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="10"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12b.xml
index 597bacb7dd..9545891efc 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12b.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12b.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12c.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12c.xml
index b13b110605..c9feaa88d7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12c.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12c.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12d.xml
index 6d5d9c7dcb..d9a10b01be 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12d.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12d.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12e.xml
index 10cfb19b9e..4810d7aee3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12e.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12e.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12f.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12f.xml
index f4b2331463..882c9fa4b2 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12f.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12f.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12g.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12g.xml
index ec8d326bb0..cd04fa683b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12g.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12g.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12h.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12h.xml
index d41a44fb0c..ea7923c99b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12h.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12h.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12i.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12i.xml
index 85cc24819a..090bf2f56c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12i.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12i.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12j.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12j.xml
index 7fd305279e..57bc06bb1e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12j.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12j.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12k.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12k.xml
index fe191f52a4..6edf24007d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12k.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12k.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12m.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12m.xml
index 74625598d7..e88ba34389 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12m.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12m.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12o.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22a.xml
similarity index 74%
rename from src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12o.xml
rename to src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22a.xml
index 35e7748c2a..0873e1e1a4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset12o.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22a.xml
@@ -1,22 +1,22 @@
 <TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
             xmlns="http://hl7.org/fhir"
             nts:scenario="client">
-   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-12o-x"/>
+   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-22a-x"/>
    <version value="r4-mp9-3.0.0-beta"/>
-   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 12o.x"/>
-   <description value="Scenario 12o.x - TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
-   <nts:authToken patientResourceId="nl-core-Patient-mp9-AvandeXXX-Toorn"
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 22a.x"/>
+   <description value="Scenario 22a.x - TEST Medicatiegegevens Scenarioset 22a (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-OXXX-Tellekamp"
                   nts:in-targets="MedMij"/>
    <nts:includeDateT value="no"/>
-   <test id="Scenario-12o-x">
-      <name value="Scenario 12o.x"/>
-      <description value="TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
+   <test id="Scenario-22a-x">
+      <name value="Scenario 22a.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22a (Consolidatie PGO)"/>
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908650&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
@@ -30,12 +30,11 @@
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="1"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22b.xml
new file mode 100644
index 0000000000..09ad9b1171
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22b.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-22b-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 22b.x"/>
+   <description value="Scenario 22b.x - TEST Medicatiegegevens Scenarioset 22b (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-FXXX-Hoefnagel"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22b-x">
+      <name value="Scenario 22b.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22b (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908649&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22c.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22c.xml
new file mode 100644
index 0000000000..1ebe5ab8a3
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22c.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-22c-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 22c.x"/>
+   <description value="Scenario 22c.x - TEST Medicatiegegevens Scenarioset 22c (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MvanXXX-Leeuwensz"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22c-x">
+      <name value="Scenario 22c.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22c (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908637&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22d.xml
new file mode 100644
index 0000000000..33543822d8
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22d.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-22d-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 22d.x"/>
+   <description value="Scenario 22d.x - TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Votel"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22d-x">
+      <name value="Scenario 22d.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908625&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22e.xml
new file mode 100644
index 0000000000..92420a41f5
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/CONS-TA-Scenarioset22e.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-AdministrationAgreement-retrieve-22e-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - AdministrationAgreement - Retrieve - Scenario 22e.x"/>
+   <description value="Scenario 22e.x - TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Leffmann"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22e-x">
+      <name value="Scenario 22e.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908613&amp;category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationDispense resource(s) representing MP9 building block AdministrationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422037009&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationDispense"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
index f7b618035d..51add7ca7a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
index 61af045303..fc154e2afd 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
index 8bcec3a840..349e448973 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
index 4945f84eb1..daa1b4f067 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
index d501a756f7..24af9897a3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=lt${DATE, T, D,-22}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
index f858dc9647..e999a7166f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422037009&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
index 0a5bf1150a..b74b17fa15 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
index 91ad536bdc..f17c40da42 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
index 6f9fb07084..4761c9c180 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset14.xml
index c8fcce6cc5..00a930d506 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
index 57ac05b60a..7ada4ce7ce 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
index f747643a90..13c0ec7c08 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="26"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="38"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 26 MedicationDispense and 12 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="12"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
index af0724c732..3b8fafe7ca 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="17"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="33"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 17 MedicationDispense and 16 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="16"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset7.xml
index 04a36097e6..85b203c23b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/AdministrationAgreement/TA-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
index 21a3a744f3..8eaae12649 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
index ff6b7c0170..476dfa15d7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
index a0c0b28d6a..37d22e285f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
index 6ad86dcf95..74d571ae7f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenario0-4.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
index a417dfe19f..edadc5d167 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
index 7a3c9e53c3..1ed7e55f38 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset14.xml
index 1c5b491934..1baebc7cb1 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
index 063e298bc6..92c87cd8a0 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset7.xml
index 02284fe3ec..e4a9670b57 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
index f50240c4d5..d2e43c9959 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/DispenseRequest/VV-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="14"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationRequest and 7 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="7"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
index ec8e0b5515..289b3f57bc 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12a.xml
@@ -14,27 +14,27 @@
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909204&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
                    nts:in-targets="MedMij">
          <nts:with-parameter name="description"
                              value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown" value="(Consists of 4  and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
index 40a1b991ce..7f628fe1ee 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12b.xml
@@ -14,27 +14,27 @@
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999909216&amp;category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
                    nts:in-targets="MedMij">
          <nts:with-parameter name="description"
                              value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
+                             value="?category=http://snomed.info/sct|&amp;_include=:medication&amp;_include=:subject"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
+         <nts:with-parameter name="resource" value=""/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown" value="(Consists of 4  and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
deleted file mode 100644
index 1dbe46b3c1..0000000000
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/CONS-MTD-Scenarioset12o.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
-            xmlns="http://hl7.org/fhir"
-            nts:scenario="client">
-   <id value="mp9-Consolidation-MedicationAdministration-retrieve-12o-x"/>
-   <version value="r4-mp9-3.0.0-beta"/>
-   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAdministration - Retrieve - Scenario 12o.x"/>
-   <description value="Scenario 12o.x - TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
-   <nts:authToken patientResourceId="nl-core-Patient-mp9-AvandeXXX-Toorn"
-                  nts:in-targets="MedMij"/>
-   <nts:includeDateT value="no"/>
-   <test id="Scenario-12o-x">
-      <name value="Scenario 12o.x"/>
-      <description value="TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
-      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
-         <nts:with-parameter name="description"
-                             value="Test client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
-      </nts:include>
-      <nts:include value="medmij/test.phr.search"
-                   scope="common"
-                   nts:in-targets="MedMij">
-         <nts:with-parameter name="description"
-                             value="Test PHR client to retrieve  resource(s) representing MP9 building block MedicationAdministration"/>
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="params"
-                             value="?category=http://snomed.info/sct|18629005&amp;_include=MedicationAdministration:medication&amp;_include=MedicationAdministration:subject"/>
-      </nts:include>
-      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <nts:include value="assert-returnCount" scope="project">
-         <nts:with-parameter name="resource" value="MedicationAdministration"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown" value="(Consists of 4  and 1 Medication resources.)"/>
-      </nts:include>
-   </test>
-</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
index dc278d61fc..07b1725222 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationAdministration and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
index bfc2b0ad6e..b8c3efd88b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
index 7f3feed4c9..90111f1ad7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 948f2cbd95..0e6ca997ae 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
index a9fe022151..02b2fe54ea 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
index 4beb88382d..8bf5d3f33d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
index 6428974bc5..d20b177fd8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset10.xml
index 228a1394b6..d9348fee77 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset11.xml
index 626d0095d5..bbed586a18 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset11.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset13.xml
index eff8a48e31..b05c95cd1a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset13.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset16.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset16.xml
index 904c1fe710..de8b42f5ce 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset16.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset16.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
index 16ff4aa4e8..30eb97817f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset3.xml
index 18acd5976a..d53642d7c6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="9"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="13"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 9 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
index a4d4a264db..aa1cabe419 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset7.xml
index 45f3315ec2..e70efdb9e8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAdministration/MTD-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12L.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12L.xml
index bae5c8ad39..e4e01d84c7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12L.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12L.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12a.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12a.xml
index 21ad5613c0..9b5ebf722a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12a.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12a.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="20"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="30"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 20 MedicationRequest and 10 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="10"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12b.xml
index e62daa26ef..483b15886a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12b.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12b.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12c.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12c.xml
index 71843325bc..fd61f27ee1 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12c.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12c.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12d.xml
index c2e7e554ed..b64e9c4a68 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12d.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12d.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12e.xml
index 5570e060cd..5b1576d916 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12e.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12e.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12f.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12f.xml
index b7e4e9939d..4988157158 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12f.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12f.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12g.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12g.xml
index 1d650fab05..95f8cb1daa 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12g.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12g.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12h.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12h.xml
index 4653428261..f77ae59aaa 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12h.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12h.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12i.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12i.xml
index 2ce6417269..f752ac6e5b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12i.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12i.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12j.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12j.xml
index f72647d9fe..acda725dc0 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12j.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12j.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12k.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12k.xml
index 02775665bc..cbfa0ae834 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12k.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12k.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12m.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12m.xml
index 713bf5ec5f..dc41f7b239 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12m.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12m.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12o.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22a.xml
similarity index 72%
rename from src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12o.xml
rename to src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22a.xml
index 62e98382c1..96e5a0ac5d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset12o.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22a.xml
@@ -1,22 +1,22 @@
 <TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
             xmlns="http://hl7.org/fhir"
             nts:scenario="client">
-   <id value="mp9-Consolidation-MedicationAgreement-retrieve-12o-x"/>
+   <id value="mp9-Consolidation-MedicationAgreement-retrieve-22a-x"/>
    <version value="r4-mp9-3.0.0-beta"/>
-   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 12o.x"/>
-   <description value="Scenario 12o.x - TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
-   <nts:authToken patientResourceId="nl-core-Patient-mp9-AvandeXXX-Toorn"
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 22a.x"/>
+   <description value="Scenario 22a.x - TEST Medicatiegegevens Scenarioset 22a (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-OXXX-Tellekamp"
                   nts:in-targets="MedMij"/>
    <nts:includeDateT value="no"/>
-   <test id="Scenario-12o-x">
-      <name value="Scenario 12o.x"/>
-      <description value="TEST Medicatiegegevens Scenarioset 12o (Consolidatie)"/>
+   <test id="Scenario-22a-x">
+      <name value="Scenario 22a.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22a (Consolidatie PGO)"/>
       <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
          <nts:with-parameter name="description"
                              value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="params"
-                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908868&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908650&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
       </nts:include>
       <nts:include value="medmij/test.phr.search"
                    scope="common"
@@ -30,12 +30,11 @@
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="1"/>
-      </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
          <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22b.xml
new file mode 100644
index 0000000000..391608d41c
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22b.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationAgreement-retrieve-22b-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 22b.x"/>
+   <description value="Scenario 22b.x - TEST Medicatiegegevens Scenarioset 22b (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-FXXX-Hoefnagel"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22b-x">
+      <name value="Scenario 22b.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22b (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908649&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22c.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22c.xml
new file mode 100644
index 0000000000..5257e2633d
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22c.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationAgreement-retrieve-22c-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 22c.x"/>
+   <description value="Scenario 22c.x - TEST Medicatiegegevens Scenarioset 22c (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MvanXXX-Leeuwensz"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22c-x">
+      <name value="Scenario 22c.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22c (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908637&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22d.xml
new file mode 100644
index 0000000000..fae94125ad
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22d.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationAgreement-retrieve-22d-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 22d.x"/>
+   <description value="Scenario 22d.x - TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Votel"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22d-x">
+      <name value="Scenario 22d.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908625&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22e.xml
new file mode 100644
index 0000000000..f67a29a5e6
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/CONS-MA-Scenarioset22e.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationAgreement-retrieve-22e-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationAgreement - Retrieve - Scenario 22e.x"/>
+   <description value="Scenario 22e.x - TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Leffmann"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22e-x">
+      <name value="Scenario 22e.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908613&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="4"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
index da8fbe33ed..c5d6c93189 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
index d570f92a22..886dad22da 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
index 86b990e4dc..ea29deb47e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
index 8e171c81cd..92ed9acf1e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
index 3cf6a96088..b916c9025d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=le${DATE, T, D,-22}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
index b485bf6709..854244c3b4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|33633005&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
index 74f7443d52..97848781a7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
index 2760c99fba..01bb2a405c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
index debdcb1ccd..3f25b935aa 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset11.xml
index c9eceecaf2..0dd1f3a4a4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset11.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset13.xml
new file mode 100644
index 0000000000..7a79a8904f
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset13.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-MedicationAgreement-retrieve-13-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Retrieve - Scenario 13.x"/>
+   <description value="Scenario 13.x - TEST Medicatiegegevens MA Scenarioset 13"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-R-XXX-Smitsz"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-13-x">
+      <name value="Scenario 13.x"/>
+      <description value="TEST Medicatiegegevens MA Scenarioset 13"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901072&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset14.xml
index f8a1e16250..4d0cab5511 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
index b1573db238..e83a716b6c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
index d539902c82..26c6e85d17 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="23"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="34"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 23 MedicationRequest and 11 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="11"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
index a57acb5f56..866d1d3471 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="18"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="35"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 18 MedicationRequest and 17 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="17"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
index 5459d4c4d7..357b093953 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationAgreement/MA-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
index 85b7aafcf5..bdfc7b8c78 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
index 0a0084e0b4..34dfda1e65 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
index 353afd660d..85db1e4e24 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
index e48656d92f..168b636c42 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -28,14 +28,13 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=ge${DATE, T, D,-21}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
index 4950c66853..f19b9bf28b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -28,14 +28,13 @@
                              value="?category=http://snomed.info/sct|373784005&amp;whenhandedover=le${DATE, T, D,-22}&amp;_include=MedicationDispense:medication&amp;_include=MedicationDispense:performer&amp;_include=MedicationDispense:destination&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
index 13df5648d9..fa2604be8f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
index 6eaf3cf4f4..4bab68a69e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
index ff46a7d0a5..eced4fe858 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
index 4d802311f1..0ea9ef6d03 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset14.xml
index 0873c29c93..40e6c8c954 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
index aa27a2c849..f2445ba511 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset7.xml
index 259701d71b..dce50f4971 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
index c11907305f..f95f0de105 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationDispense/MVE-Scenarioset9.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationDispense and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12a.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12a.xml
index 7d8bbc918b..ad052032a2 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12a.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12a.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationStatement and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12b.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12b.xml
index 915b0e0bd1..e6e54f0bfc 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12b.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12b.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12c.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12c.xml
index 4e002d9b09..39658a11b5 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12c.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12c.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12d.xml
index 68ef2e58cc..3bffbaf83b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12d.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12d.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12e.xml
index f923d155c5..cc38466694 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12e.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12e.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12f.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12f.xml
index 563f23f3a8..7acd546317 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12f.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset12f.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22d.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22d.xml
new file mode 100644
index 0000000000..0c5ac7fe52
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22d.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationUse-retrieve-22d-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationUse - Retrieve - Scenario 22d.x"/>
+   <description value="Scenario 22d.x - TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Votel"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22d-x">
+      <name value="Scenario 22d.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22d (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908625&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="count" value="4"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22e.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22e.xml
new file mode 100644
index 0000000000..32c5fcf499
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/CONS-MGB-Scenarioset22e.xml
@@ -0,0 +1,40 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="client">
+   <id value="mp9-Consolidation-MedicationUse-retrieve-22e-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - Consolidation - MedicationUse - Retrieve - Scenario 22e.x"/>
+   <description value="Scenario 22e.x - TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-MXXX-Leffmann"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-22e-x">
+      <name value="Scenario 22e.x"/>
+      <description value="TEST Medicatiegegevens Scenarioset 22e (Consolidatie PGO)"/>
+      <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999908613&amp;category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject"/>
+      </nts:include>
+      <nts:include value="medmij/test.phr.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test PHR client to retrieve MedicationStatement resource(s) representing MP9 building block MedicationUse"/>
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|422979000&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:subject"/>
+      </nts:include>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="MedicationStatement"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
index f3c865190e..48e073206c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationStatement and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
index b2d933b428..0c37a2fb95 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-2.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
index 25373f50de..1fda7f841a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
index 396843632f..0f8f43fd6b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
index b70d3f17fa..432a8a2dea 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=le${DATE, T, D,-22}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
index bb927c27b7..53a56e66c8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -28,15 +28,13 @@
                              value="?category=http://snomed.info/sct|422979000&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationStatement:medication&amp;_include=MedicationStatement:author&amp;_include=MedicationStatement:prescriber&amp;_include=MedicationStatement:source&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
       </nts:include>
       <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
index 1762d92402..9e4d8e610a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenario0-7.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
index 00572bba13..91e0fd239d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationStatement and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
index ca6c4b2444..919d677299 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset13.xml
index ab4f4ab1de..dca2e4de1c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset13.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset14.xml
index ab2dd6c663..df0eaefded 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
index 9628841451..909a97974a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset5.xml
index 10a3749edc..d508c86f6a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="13"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationStatement and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
index d5721c73de..f7008e765e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="16"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="31"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 16 MedicationStatement and 15 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="15"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset7.xml
index b636776edd..bf7d3654ff 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/MedicationUse/MGB-Scenarioset7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12L.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12L.xml
index 049be68fb8..11c0302acf 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12L.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12L.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12g.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12g.xml
index a283ce9c1d..5c072ed7a6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12g.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12g.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12h.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12h.xml
index c87d9b4796..b2cd074e6b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12h.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12h.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12i.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12i.xml
index 521d6aa063..741c0373f8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12i.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12i.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12j.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12j.xml
index c56444910c..d74e8b0c2f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12j.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12j.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12k.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12k.xml
index 52ccff3d22..fe1a912cbb 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12k.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12k.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12m.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12m.xml
index ebba3c3e50..cc55d07009 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12m.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/CONS-WDS-Scenarioset12m.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index 5066f08a03..ec9d355668 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index 09803a7497..22d5f20f5a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -36,10 +36,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
index a8d366b13d..ff0776da96 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
@@ -31,10 +31,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 08c788f924..6a76147a48 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -27,16 +27,14 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index 804ce32452..57b651bc35 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index a37bc512b9..0b786d4b2f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -27,16 +27,14 @@
          <nts:with-parameter name="params"
                              value="?category=http://snomed.info/sct|395067002&amp;period-of-use=ge${DATE, T, D,-21}&amp;period-of-use=le${DATE, T, D,-7}&amp;_include=MedicationRequest:medication"/>
       </nts:include>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
+      <nts:include value="canary-assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
-      </nts:include> -->
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index 30235a960c..55e0344179 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -36,10 +36,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
index 020e6e12e0..0ee86e4df8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
index f00970393f..5dfbde68f6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
index 5d8347441d..4221b43d1c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
index 92588cd4fa..932c1113e6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
index e70dea33dc..1acdf92077 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
@@ -32,9 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
index a5fd46fb8b..091d30c311 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
index dcc6e7beb3..d5650a6850 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
index 0815148f5d..275a035cfd 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Retrieving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Sending-System/MA-Scenario13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Sending-System/MA-Scenario13.xml
new file mode 100644
index 0000000000..af7274a751
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Sending-System/MA-Scenario13.xml
@@ -0,0 +1,39 @@
+<TestScript xmlns="http://hl7.org/fhir"
+            xmlns:nts="http://nictiz.nl/xsl/testscript"
+            nts:scenario="client">
+   <id value="mp9-meddata-send-13-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="MP9 - Client - Scenario 13.x - Send MedicationData - MA-Scenario13"/>
+   <description value="Scenario 13.x - Send MedicationData for H. XXX_Hoek."/>
+   <nts:fixture id="mgsets-mp-smg-tst-MA-Scenario13-v30"
+                href="fixtures/mgsets-mp-smg-tst-MA-Scenario13-v30.xml"
+                nts:in-targets="Nictiz-intern"/>
+   <nts:includeDateT value="yes" nts:in-targets="Nictiz-intern"/>
+   <test id="scenario13-x-send-meddata">
+      <name value="Scenario 13.x"/>
+      <description value="Send MedicationData in a transaction Bundle"/>
+      <action>
+         <operation>
+            <type>
+               <system value="http://terminology.hl7.org/CodeSystem/testscript-operation-codes"/>
+               <code value="transaction"/>
+            </type>
+            <description value="Test client to POST a Bundle of type transaction."/>
+            <destination value="1"/>
+            <origin value="1"/>
+            <responseId value="transaction-response-fixture"/>
+            <sourceId value="mgsets-mp-smg-tst-MA-Scenario13-v30"
+                      nts:in-targets="Nictiz-intern"/>
+         </operation>
+      </action>
+      <nts:include value="test.client.successfulTransaction" scope="common"/>
+      <nts:include value="assert.request.numResources"
+                   scope="common"
+                   resource="MedicationRequest"
+                   count="1"/>
+      <nts:include value="assert.request.numResources"
+                   scope="common"
+                   resource="Medication"
+                   count="1"/>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
index 832e49d66d..4bc4bbd946 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
index 2b0a07e9f2..fb7e635512 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
index 8c8aa0aef6..b01699fb07 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
index f45df3a8ba..4cec6744a3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
index 6ddcc9c468..95ff8c02e4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
index d98d9f2d64..212668a1e6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationDispense and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
index 91dce71967..0d7ddc2002 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
index cbe18ff46b..bb7a60960c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
index d5f7204d8f..7983962b1d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset14.xml
index bb0c642ac3..eb58d7cf91 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
index a05691f4b9..a990d9cd85 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationDispense and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
index 5c54e7863b..c0fd94f8fd 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="26"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="38"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 26 MedicationDispense and 12 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="12"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
index 843aa60237..0b3b90578b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="17"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="33"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 17 MedicationDispense and 16 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="16"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset7.xml
index dff899605b..08eaeb1f3f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/AdministrationAgreement/TA-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
index 75fd9a4c7a..235de1f9fe 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
index ef641926cc..212d1ba2c7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
index b98c7936f2..7fd3b41f71 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
index edff170adf..09a6130419 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenario0-4.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
index af080b3334..9981d31cc3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
index 691557e54d..473d70cba7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset14.xml
index ee38c998cd..1241b4a3c7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
index d248258608..2bc9c138de 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset7.xml
index 647b2f0593..cdb27ed38b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
index f2ed6c7c05..c1a83b96fe 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/DispenseRequest/VV-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="14"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationRequest and 7 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="7"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
index fd87dbc8c6..fc3d9fb0ef 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationAdministration and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
index e8e4684ac2..1df4a5c8a4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-2.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
index d03e353195..cb9cf60efd 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
index 44362f9a23..3ad37289b5 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
index c478dcb289..ebd2c03185 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationAdministration and 3 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
index 27576cc0a7..b7e119b33a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
index 2826b472ce..99985cf285 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenario0-7.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset10.xml
index dc31ea0030..8d5c790b65 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset11.xml
index 388a8d0fa1..74dd4c6b62 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset11.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset13.xml
index d2c615c929..14957e8e16 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset13.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationAdministration and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset16.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset16.xml
index ccd95c01e7..62a391abf4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset16.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset16.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="9"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
index 9807009210..5aea2164e8 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset3.xml
index 9254e73bdf..049bf37122 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="9"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="13"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 9 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
index a3ae028a87..150e9fee1c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationAdministration and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset7.xml
index 7771e00596..e84a21d1cb 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAdministration/MTD-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationAdministration"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationAdministration and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
index d029c659ed..06d7c24e24 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
index 1d158514a1..7a00630ee5 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
index cea523ad4d..99c71bdbb0 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
index ed2db16735..e617a71b51 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
index 353918b4e4..b89f6ae5c0 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
index 3c333837dc..89e25fb179 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
index b8ad8cf73a..734f8fd903 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
index d866a959ba..ea5e85dabc 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
index 46988a835d..77021b3974 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset11.xml
index 63375baf99..e26607ad58 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset11.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset13.xml
new file mode 100644
index 0000000000..e5202ec3e6
--- /dev/null
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset13.xml
@@ -0,0 +1,41 @@
+<TestScript xmlns:nts="http://nictiz.nl/xsl/testscript"
+            xmlns="http://hl7.org/fhir"
+            nts:scenario="server">
+   <id value="mp9-MedicationAgreement-serve-13-x"/>
+   <version value="r4-mp9-3.0.0-beta"/>
+   <name value="Medication Process 9 3.0.0-beta  - MedicationAgreement - Serve - Scenario 13.x"/>
+   <description value="Scenario 13.x - TEST Medicatiegegevens MA Scenarioset 13"/>
+   <nts:authToken patientResourceId="nl-core-Patient-mp9-R-XXX-Smitsz"
+                  nts:in-targets="MedMij"/>
+   <nts:includeDateT value="no"/>
+   <test id="Scenario-13-x">
+      <name value="Scenario 13.x"/>
+      <description value="TEST Medicatiegegevens MA Scenarioset 13"/>
+      <nts:include value="test.server.search" scope="common" nts:in-targets="#default">
+         <nts:with-parameter name="description"
+                             value="Test server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?patient.identifier=http://fhir.nl/fhir/NamingSystem/bsn|999901072&amp;category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+      </nts:include>
+      <nts:include value="medmij/test.xis.search"
+                   scope="common"
+                   nts:in-targets="MedMij">
+         <nts:with-parameter name="description"
+                             value="Test XIS server to serve MedicationRequest resource(s) representing MP9 building block MedicationAgreement"/>
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="params"
+                             value="?category=http://snomed.info/sct|33633005&amp;_include=MedicationRequest:medication&amp;_include=MedicationRequest:subject&amp;_include=MedicationRequest:reason&amp;_include=MedicationRequest:next-practitioner&amp;_include=MedicationRequest:requester&amp;_include:iterate=PractitionerRole:organization&amp;_include:iterate=PractitionerRole:practitioner&amp;_include:iterate=PractitionerRole:location"/>
+      </nts:include>
+      <nts:include value="assert.response.successfulSearch" scope="common"/>
+      <nts:include value="assert-responseBundleContent-noMM"/>
+      <nts:include value="assert-returnCountAtLeast" scope="project">
+         <nts:with-parameter name="resource" value="MedicationRequest"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
+      </nts:include>
+   </test>
+</TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset14.xml
index 7b503759be..f45cbffd96 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
index 57a883cd20..670e3127b7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationRequest and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
index 92696d7af3..ad8d771d4d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="23"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="34"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 23 MedicationRequest and 11 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="11"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
index 5171fcac73..ed0b3fb864 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="18"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="35"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 18 MedicationRequest and 17 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="17"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
index 28fea7c4de..42a0b4210a 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationAgreement/MA-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
index 940b40cce3..1d56d7da45 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationDispense and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
index b05a7b0cfe..832058fe7d 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
index 9160354a14..318c6a82dd 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
index 4ad377791a..bb8ff694a6 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-4.xml
@@ -29,14 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="2"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="2"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
index 5919ba654a..512c78ef5e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-5.xml
@@ -29,14 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationDispense"/>
-         <nts:with-parameter name="count" value="4"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
       <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="Medication"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
index 11b742642d..cc3a935558 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
index 62fa6665c0..d57103cd85 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
index d344852b87..ada0e1c351 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
index e52c61f2bf..7c74b10650 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationDispense and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset14.xml
index 3622d0d43e..8b5e8b6b68 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
index 3bcc9cd4e1..6f870913d3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationDispense and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset7.xml
index bcf15af5ef..1d19663692 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationDispense and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
index 1ec8e393e7..923f80bc0b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationDispense/MVE-Scenarioset9.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationDispense"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationDispense and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
index de7f585448..143773c270 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="12"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationStatement and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
index 2e4cf8ba8f..521fab343e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
index 2879f92503..35e799536f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-3-optioneel.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
index e10fecde31..efec7a342e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
index 99bb0d869f..c551f94843 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-5.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
index 9895af0a0f..e7433c49c5 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationStatement"/>
-         <nts:with-parameter name="count" value="4"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="6"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationStatement and 3 Medication resources.)"/>
+         <nts:with-parameter name="count" value="3"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="3"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
index 166b842384..2aed717bf7 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
index d3f75270bc..d6015d237b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="5"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="10"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 5 MedicationStatement and 5 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="5"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
index 722df9715b..3771571a78 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset13.xml
index f60f203c83..4621ff2733 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset13.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationStatement and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset14.xml
index e89e8d7bda..7a64b32236 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
index f18f8bb167..cfc63e30b3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationStatement and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset5.xml
index 7bff4fb7b5..2943a484e4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="7"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="13"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 7 MedicationStatement and 6 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="6"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
index 5f4f3c2e22..d190ad3402 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="16"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="31"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 16 MedicationStatement and 15 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="15"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset7.xml
index 61e41f1615..be863e635b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/MedicationUse/MGB-Scenarioset7.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationStatement"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationStatement and 4 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="4"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
index e0ff976fee..86c740af5c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-1.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="6"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="8"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 6 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
index ccad1c7709..e812475625 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-2.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
index 1f4c9fac4e..9ab7a5686f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-3.xml
@@ -32,10 +32,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
index 48a48d7bf5..1ab4f9cd3f 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-4.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
index 090d8220a1..a5885073bb 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-5.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="4"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="5"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 4 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
index 72821d7b23..79f0dc67b4 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-6.xml
@@ -29,15 +29,13 @@
       </nts:include>
       <nts:include value="assert.response.successfulSearch" scope="common"/>
       <nts:include value="assert-responseBundleContent-noMM"/>
-      <!-- NICTIZ-35941 -->
-      <!-- <nts:include value="assert-returnCount" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
          <nts:with-parameter name="resource" value="MedicationRequest"/>
-         <nts:with-parameter name="count" value="3"/>
-      </nts:include> -->
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+         <nts:with-parameter name="count" value="2"/>
+      </nts:include>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
index 7a412490bc..5fb4a421b2 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenario0-7.xml
@@ -37,10 +37,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset1.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
index d55c808074..2cf2690246 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset1.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
index 65ada70c95..9b947cb62c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset10.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset11.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
index 11ca7dd75e..e3d74d5f1b 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset11.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="3"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset13.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
index c56dec0cb2..00fb104c8e 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset13.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="1"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="2"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 1 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset14.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
index a5d9117871..771c040d0c 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset14.xml
@@ -33,9 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="0"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
          <nts:with-parameter name="count" value="0"/>
-         <nts:with-parameter name="breakdown" value="(Consists of no resources.)"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
index f4618a5e92..e0302b9cee 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset2.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset3.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
index 4f7b6cea90..a9ba0a9e00 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset3.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="3"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 3 MedicationRequest and 1 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="1"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
index c29ed37f47..a2fbe5ede3 100644
--- a/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
+++ b/src/MP9-3-0-0-beta/Test/MedicationData/Serving-System/VariableDosingRegimen/WDS-Scenarioset6.xml
@@ -33,10 +33,9 @@
          <nts:with-parameter name="resource" value="MedicationRequest"/>
          <nts:with-parameter name="count" value="2"/>
       </nts:include>
-      <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-         <nts:with-parameter name="count" value="4"/>
-         <nts:with-parameter name="breakdown"
-                             value="(Consists of 2 MedicationRequest and 2 Medication resources.)"/>
+      <nts:include value="assert-returnCount" scope="project">
+         <nts:with-parameter name="resource" value="Medication"/>
+         <nts:with-parameter name="count" value="2"/>
       </nts:include>
    </test>
 </TestScript>
diff --git a/src/MP9-3-0-0-beta/_internalTools/xslt/ada_2_nts-medicationdata-pull.xsl b/src/MP9-3-0-0-beta/_internalTools/xslt/ada_2_nts-medicationdata-pull.xsl
index 9093838042..195275d45c 100644
--- a/src/MP9-3-0-0-beta/_internalTools/xslt/ada_2_nts-medicationdata-pull.xsl
+++ b/src/MP9-3-0-0-beta/_internalTools/xslt/ada_2_nts-medicationdata-pull.xsl
@@ -218,12 +218,16 @@
         <xsl:variable name="theScenarioParamsMedMij" select="concat('?', $theParamParts, $theAdditionalParamParts)"/>
         
         <xsl:variable name="returnCount" select="count($adaInstance/medicamenteuze_behandeling/*[not(self::identificatie)])"/>
-        <xsl:variable name="returnMedicationCount" select="count($adaInstance/bouwstenen/farmaceutisch_product)"/>
-        <xsl:variable name="returnEntryCount" select="$returnCount + $returnMedicationCount"/>
+        <!-- Select ADA Medication entries -->
+        <xsl:variable name="medicationValues" as="xs:string*"
+            select="$adaInstance/medicamenteuze_behandeling//farmaceutisch_product/@value"/>
+        <xsl:variable name="medicationValuesDistinct" as="xs:string*" select="distinct-values($medicationValues)"/>  
+        <xsl:variable name="expectedMedCount" select="count($medicationValuesDistinct)"/>
+        <xsl:variable name="returnEntryCount" select="$returnCount + $expectedMedCount"/>
         <xsl:variable name="returnEntryBreakdown">
             <xsl:choose>
                 <xsl:when test="$returnEntryCount gt 0">
-                    <xsl:value-of select="concat('(Consists of ', $returnCount, ' ', $matchResource, ' and ', $returnMedicationCount, ' Medication resources.)')"/>
+                    <xsl:value-of select="concat('(Consists of ', $returnCount, ' ', $matchResource, ' and ', $expectedMedCount, ' Medication resources.)')"/>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:text>(Consists of no resources.)</xsl:text>
@@ -269,7 +273,8 @@
                                     <name value="Scenario {$scenarioset}.{$scenario}"/>
                                     <description value="{$description}"/>
                                     <xsl:choose>
-                                        <xsl:when test="$transactionTypeNormalized = 'retrieve'">
+                                        <xsl:when test="$transactionTypeNormalized = 'retrieve'">     
+                                            <!-- Build filtered identifier sets and expected counts -->                                           
                                             <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
                                                 <nts:with-parameter name="description" value="Test client to retrieve {$matchResource} resource(s) representing MP9 building block {$buildingBlockLong}"/>
                                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
@@ -285,12 +290,13 @@
                                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
                                                 <nts:with-parameter name="count" value="{$returnCount}"/>
                                             </nts:include>
-                                            <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-                                                <nts:with-parameter name="count" value="{$returnEntryCount}"/>
-                                                <nts:with-parameter name="breakdown" value="{$returnEntryBreakdown}"/>
-                                            </nts:include>
+                                            <!-- Assert Medication count -->
+                                            <nts:include value="assert-returnCount" scope="project">
+                                                <nts:with-parameter name="resource" value="Medication"/>
+                                                <nts:with-parameter name="count" value="{$expectedMedCount}"/>
+                                            </nts:include> 
                                         </xsl:when>
-                                        <xsl:when test="$transactionTypeNormalized = 'serve'">
+                                        <xsl:when test="$transactionTypeNormalized = 'serve'">     
                                             <!--NICTIZ-29763 removed CheckContent from target so no content asserts scripts will be generated
                                                  <nts:include value="test.server.search" scope="common" nts:in-targets="#default CheckContent">-->
                                             <nts:include value="test.server.search" scope="common" nts:in-targets="#default">
@@ -308,43 +314,12 @@
                                             <nts:include value="assert-returnCountAtLeast" scope="project">
                                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
                                                 <nts:with-parameter name="count" value="{$returnCount}"/>
-                                            </nts:include>
-                                            <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-                                                <nts:with-parameter name="count" value="{$returnEntryCount}"/>
-                                                <nts:with-parameter name="breakdown" value="{$returnEntryBreakdown}"/>
-                                            </nts:include>
-                                            
-                                            <!-- adding content assertions -->
-                                            
-                                            <!-- adding content assertions for medicatiebouwstenen --> 
-                                            <!-- TODO: add content assertions for bouwstenen like medicatie and zorgverlener and patient --> 
-                                            <!-- removed content asserts as the discriminator doesn't work in productionlike settings because suppliers will have different identifiers.
-                                                 the discriminator should be based on the "identifyResources" variable but this is currently only implemented in
-                                                 send scripts (ada_2_nts.xsl from https://github.com/Nictiz/Nictiz-testscripts/blob/identificationAsserts/src/MP9-3-0-0-beta/Test/_internalTools/xslt/ada_2_nts.xsl)
-                                                 
-                                                 <xsl:variable name="identifiers" select="$adaInstance/medicamenteuze_behandeling/*/identificatie/@value"/>
-                                                 
-                                                 <xsl:if test="$identifiers">
-                                                 <xsl:for-each select="$identifiers">
-                                                 <xsl:variable name="fixtureId">
-                                                 <xsl:call-template name="findContentAssertFixture">
-                                                 <xsl:with-param name="identifier" select="."/>
-                                                 </xsl:call-template>
-                                                 </xsl:variable>
-                                                 <xsl:call-template name="util:logMessage">
-                                                 <xsl:with-param name="level" select="$logINFO"/>
-                                                 <xsl:with-param name="msg"> The resource with this identifier <xsl:value-of select="."/> will be asserted based on fixtureId: <xsl:value-of select="$fixtureId"/></xsl:with-param>
-                                                 </xsl:call-template>
-                                                 <xsl:variable name="apos">'</xsl:variable>
-                                                 <nts:contentAsserts href="{concat('fixtures/', $fixtureId, '.xml')}" description="{concat('contains a resource with identifier = ',.)}" 
-                                                 discriminator="{concat('identifier.value =', $apos, xs:string(.), $apos)}"
-                                                 nts:in-targets="CheckContent"/>
-                                                 </xsl:for-each>
-                                                 </xsl:if>
-                                            -->
-                                            
-                                            
-                                            
+                                            </nts:include>                                                                                     
+                                            <!-- Assert Medication count -->
+                                            <nts:include value="assert-returnCount" scope="project">
+                                                <nts:with-parameter name="resource" value="Medication"/>
+                                                <nts:with-parameter name="count" value="{$expectedMedCount}"/>
+                                            </nts:include> 
                                         </xsl:when>
                                     </xsl:choose>
                                 </test>
@@ -470,12 +445,16 @@
         
         <xsl:variable name="description" as="xs:string?" select="$adaInstance/@desc"/>
         <xsl:variable name="returnCount" select="count($adaInstance/medicamenteuze_behandeling/*[not(self::identificatie)])"/>
-        <!-- We add the medication products, since those are in an include in the query -->
-        <xsl:variable name="returnEntryCount" select="$returnCount + count($adaInstance/bouwstenen/farmaceutisch_product)"/>
+        <!-- Select ADA Medication entries -->
+        <xsl:variable name="medicationValues" as="xs:string*"
+            select="$adaInstance/medicamenteuze_behandeling//farmaceutisch_product/@value"/>
+        <xsl:variable name="medicationValuesDistinct" as="xs:string*" select="distinct-values($medicationValues)"/>  
+        <xsl:variable name="expectedMedCount" select="count($medicationValuesDistinct)"/>
+        <xsl:variable name="returnEntryCount" select="$returnCount + $expectedMedCount"/>
         <xsl:variable name="returnEntryBreakdown">
             <xsl:choose>
                 <xsl:when test="$returnEntryCount gt 0">
-                    <xsl:value-of select="concat('(Consists of ', $returnCount, ' ', $matchResource, ' and ', count($adaInstance/bouwstenen/farmaceutisch_product), ' Medication resources.)')"/>
+                    <xsl:value-of select="concat('(Consists of ', $returnCount, ' ', $matchResource, ' and ', $expectedMedCount, ' Medication resources.)')"/>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:text>(Consists of no resources.)</xsl:text>
@@ -518,8 +497,7 @@
                     <name value="Scenario {$theScenario}"/>
                     <description value="{$description}"/>
                     <xsl:choose>
-                        <xsl:when test="$transactionTypeNormalized = 'retrieve'">
-                            
+                        <xsl:when test="$transactionTypeNormalized = 'retrieve'">                            
                             <nts:include value="test.client.search" scope="common" nts:in-targets="#default">
                                 <nts:with-parameter name="description" value="Test client to retrieve {$matchResource} resource(s) representing MP9 building block {$buildingBlockLong}"/>
                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
@@ -536,12 +514,13 @@
                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
                                 <nts:with-parameter name="count" value="{$returnCount}"/>
                             </nts:include>
-                            <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-                                <nts:with-parameter name="count" value="{$returnEntryCount}"/>
-                                <nts:with-parameter name="breakdown" value="{$returnEntryBreakdown}"/>
-                            </nts:include>
+                            <!-- Assert Medication count -->
+                            <nts:include value="assert-returnCount" scope="project">
+                                <nts:with-parameter name="resource" value="Medication"/>
+                                <nts:with-parameter name="count" value="{$expectedMedCount}"/>
+                            </nts:include> 
                         </xsl:when>
-                        <xsl:when test="$transactionTypeNormalized = 'serve'">
+                        <xsl:when test="$transactionTypeNormalized = 'serve'">                           
                             <!--NICTIZ-29763 removed CheckContent from target so no content asserts scripts will be generated
                                  <nts:include value="test.server.search" scope="common" nts:in-targets="#default CheckContent">-->
                             <nts:include value="test.server.search" scope="common" nts:in-targets="#default">
@@ -560,35 +539,13 @@
                             <nts:include value="assert-returnCount" scope="project">
                                 <nts:with-parameter name="resource" value="{$matchResource}"/>
                                 <nts:with-parameter name="count" value="{$returnCount}"/>
-                            </nts:include>
-                            <nts:include value="assert-returnEntryCountAtLeast" scope="project">
-                                <nts:with-parameter name="count" value="{$returnEntryCount}"/>
-                                <nts:with-parameter name="breakdown" value="{$returnEntryBreakdown}"/>
-                            </nts:include>
-                            
-                            <!-- adding content assertions -->
-                            <!-- TODO: add content assertions for medicatiebouwstenen from filter queries scenario 0--> 
-                            <!-- TODO: add content assertions for bouwstenen like medicatie and zorgverlener and patient --> 
-                            <!--               <xsl:variable name="identifiers" select="$adaInstance/medicamenteuze_behandeling/*/identificatie/@value"/>
-                                 
-                                 <xsl:if test="$identifiers">
-                                 <xsl:for-each select="$identifiers">
-                                 <xsl:variable name="fixtureId">
-                                 <xsl:call-template name="findContentAssertFixture">
-                                 <xsl:with-param name="identifier" select="."/>
-                                 </xsl:call-template>
-                                 </xsl:variable>
-                                 <xsl:call-template name="util:logMessage">
-                                 <xsl:with-param name="level" select="$logINFO"/>
-                                 <xsl:with-param name="msg"> The resource with this identifier <xsl:value-of select="."/> will be asserted based on fixtureId: <xsl:value-of select="$fixtureId"/></xsl:with-param>
-                                 </xsl:call-template>
-                                 <xsl:variable name="apos">'</xsl:variable>
-                                 <nts:contentAsserts href="{concat('fixtures/', $fixtureId, '.xml')}" description="{concat('contains a resource with identifier = ',.)}" 
-                                 discriminator="{concat('Bundle.entry.resource.where(identifier.value =', $apos, xs:string(.), $apos)}"
-                                 nts:in-targets="CheckContent"/>
-                                 </xsl:for-each>
-                                 </xsl:if>-->
-                         </xsl:when>
+                            </nts:include>                            
+                            <!-- Assert Medication count -->
+                            <nts:include value="assert-returnCount" scope="project">
+                                <nts:with-parameter name="resource" value="Medication"/>
+                                <nts:with-parameter name="count" value="{$expectedMedCount}"/>
+                            </nts:include> 
+                        </xsl:when>
                         <xsl:otherwise>
                             <xsl:call-template name="util:logMessage">
                                 <xsl:with-param name="level" select="$logFATAL"/>