au_core_test_kit 1.4.0 → 1.4.2

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/medication_request_read_test.rb

@@ -1,17 +1,23 @@
 # frozen_string_literal: true
 
-require_relative '../../../read_test'
+require 'inferno_suite_generator/test_modules/read_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationRequestReadTest < Inferno::Test
-      include AUCoreTestKit::ReadTest
+      include InfernoSuiteGenerator::ReadTest
 
       title '(SHALL) Server returns correct MedicationRequest resource from MedicationRequest read interaction'
       description 'A server SHALL support the MedicationRequest read interaction.'
 
       id :au_core_v200_medication_request_read_test
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def resource_type
         'MedicationRequest'
       end

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/medication_request_reference_resolution_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../reference_resolution_test'
+require 'inferno_suite_generator/test_modules/reference_resolution_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationRequestReferenceResolutionTest < Inferno::Test
-      include AUCoreTestKit::ReferenceResolutionTest
+      include InfernoSuiteGenerator::ReferenceResolutionTest
 
       title 'MustSupport references within MedicationRequest resources are valid'
       description %(
@@ -31,7 +31,7 @@ module AUCoreTestKit
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
@@ -39,7 +39,7 @@ module AUCoreTestKit
       end
 
       run do
-        perform_reference_resolution_test(scratch_resources[:all])
+        perform_reference_resolution_test(scratch_resources[:all], { 'http://hl7.org.au/fhir/StructureDefinition/au-specimen' => 'http://hl7.org.au/fhir/StructureDefinition/au-specimen' })
       end
     end
   end

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/medication_request_status_multiple_or_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationRequestStatusMultipleOrSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHALL) Server returns valid results for MedicationRequest multipleOr search by status'
       description %(A server SHALL support searching by multipleOr
@@ -15,7 +15,7 @@ status on the MedicationRequest resource. This test
 will pass if resources are returned and match the search criteria. If
 none are returned, the test is skipped.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 )
 
       id :au_core_v200_medication_request_status_multiple_or_search_test
@@ -26,14 +26,14 @@ none are returned, the test is skipped.
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
       def self.properties
-        @properties ||= SearchTestProperties.new(resource_type: 'MedicationRequest',
-                                                 search_param_names: ['status'],
-                                                 test_medication_inclusion: true,
-                                                 multiple_or_search_params: true)
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(resource_type: 'MedicationRequest',
+                                                                        search_param_names: ['status'],
+                                                                        test_medication_inclusion: true,
+                                                                        multiple_or_search_params: true)
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/medication_request_status_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationRequestStatusSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(MAY) Server returns valid results for MedicationRequest search by status'
       description %(
@@ -16,34 +16,38 @@ status on the MedicationRequest resource. This test
 will pass if resources are returned and match the search criteria. If
 none are returned, the test is skipped.
 
-If any MedicationRequest resources use external references to
-Medications, the search will be repeated with
-`_include=MedicationRequest:medication`.
-
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 
       )
 
       id :au_core_v200_medication_request_status_search_test
       optional
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationRequest',
-          search_param_names: ['status'],
-          test_medication_inclusion: true,
-          includes: [{ 'parameter' => 'MedicationRequest:medication', 'target_resource' => 'Medication', 'paths' => ['medicationReference'] }]
+          search_param_names: ['status']
         )
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
         scratch[:medication_request_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/medication_request_validation_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../validation_test'
+require 'inferno_suite_generator/test_modules/validation_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationRequestValidationTest < Inferno::Test
-      include AUCoreTestKit::ValidationTest
+      include InfernoSuiteGenerator::ValidationTest
 
       id :au_core_v200_medication_request_validation_test
       title 'MedicationRequest resources returned during previous tests conform to the AU Core MedicationRequest'
@@ -31,6 +31,10 @@ fail if their code/system are not found in the valueset.
         scratch[:medication_request_resources] ||= {}
       end
 
+      def filter_set
+        []
+      end
+
       run do
         perform_validation_test(scratch_resources[:all] || [],
                                 'http://hl7.org.au/fhir/core/StructureDefinition/au-core-medicationrequest',

data/lib/au_core_test_kit/generated/v2.0.0/medication_request/metadata.yml

@@ -94,10 +94,10 @@
       :eb: MAY
       :ap: MAY
     :values:
-    - ge1950-01-01T00:00:00.000Z
-    - le2050-01-01T23:59:59.999Z
-    - gt1950-01-01T00:00:00.000Z
-    - lt2050-01-01T23:59:59.999Z
+    - ge1950-01-01
+    - le2050-01-01
+    - gt1950-01-01
+    - lt2050-01-01
     :type: dateTime
     :contains_multiple: false
     :multiple_and: SHOULD
@@ -215,12 +215,18 @@
 - :path: MedicationRequest.medication[x]
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-medication
+  :resource_types:
+  - Medication
 - :path: MedicationRequest.subject
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient
+  :resource_types:
+  - Patient
 - :path: MedicationRequest.encounter
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter
+  :resource_types:
+  - Encounter
 - :path: MedicationRequest.supportingInformation
   :profiles:
   - http://hl7.org/fhir/StructureDefinition/Resource|4.0.1
@@ -237,6 +243,12 @@
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-organization
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-relatedperson
+  :resource_types:
+  - Practitioner
+  - PractitionerRole
+  - Organization
+  - Patient
+  - RelatedPerson
 - :path: MedicationRequest.performer
   :profiles:
   - http://hl7.org/fhir/StructureDefinition/Practitioner|4.0.1
@@ -254,6 +266,8 @@
   :profiles:
   - http://hl7.org.au/fhir/core/StructureDefinition/au-core-condition
   - http://hl7.org/fhir/StructureDefinition/Observation
+  :resource_types:
+  - Condition
 - :path: MedicationRequest.basedOn
   :profiles:
   - http://hl7.org/fhir/StructureDefinition/CarePlan|4.0.1
@@ -323,8 +337,8 @@
   :file_name: medication_request_patient_intent_authoredon_include_medication_test.rb
 - :id: au_core_v200_medication_request_validation_test
   :file_name: medication_request_validation_test.rb
-- :id: au_core_v200_medication_validation_test
-  :file_name: medication_validation_test.rb
+- :id: au_core_v200_medication_request_medication_validation_test
+  :file_name: medication_request_medication_inclusion_validation_test.rb
 - :id: au_core_v200_medication_request_must_support_test
   :file_name: medication_request_must_support_test.rb
 - :id: au_core_v200_medication_request_reference_resolution_test

data/lib/au_core_test_kit/generated/v2.0.0/medication_request_group.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'inferno_suite_generator/core/ig_demodata'
 require_relative 'medication_request/medication_request_patient_search_test'
 require_relative 'medication_request/medication_request_id_search_test'
 require_relative 'medication_request/medication_request_authoredon_search_test'
@@ -23,7 +24,7 @@ require_relative 'medication_request/medication_request_patient_intent_include_m
 require_relative 'medication_request/medication_request_patient_intent_status_include_medication_test'
 require_relative 'medication_request/medication_request_patient_intent_authoredon_include_medication_test'
 require_relative 'medication_request/medication_request_validation_test'
-require_relative 'medication_request/medication_validation_test'
+require_relative 'medication_request/medication_request_medication_inclusion_validation_test'
 require_relative 'medication_request/medication_request_must_support_test'
 require_relative 'medication_request/medication_request_reference_resolution_test'
 
@@ -90,7 +91,7 @@ read succeeds.
       run_as_group
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'medication_request', 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'medication_request', 'metadata.yml'), aliases: true))
       end
 
       test from: :au_core_v200_medication_request_patient_search_test
@@ -116,7 +117,7 @@ read succeeds.
       test from: :au_core_v200_medication_request_patient_intent_status_include_patient_intent_status_search_test
       test from: :au_core_v200_medication_request_patient_intent_authoredon_include_patient_intent_authoredon_search_test
       test from: :au_core_v200_medication_request_validation_test
-      test from: :au_core_v200_medication_validation_test
+      test from: :au_core_v200_medication_request_medication_validation_test
       test from: :au_core_v200_medication_request_must_support_test
       test from: :au_core_v200_medication_request_reference_resolution_test
     end

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_effective_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementEffectiveSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(MAY) Server returns valid results for MedicationStatement search by effective'
       description %(
@@ -16,30 +16,39 @@ effective on the MedicationStatement resource. This test
 will pass if resources are returned and match the search criteria. If
 none are returned, the test is skipped.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 
       )
 
       id :au_core_v200_medication_statement_effective_search_test
       optional
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: ['effective'],
-          possible_status_search: true,
-          includes: [{ 'parameter' => 'MedicationStatement:medication', 'target_resource' => 'Medication', 'paths' => ['medicationReference'] }]
+          possible_status_search: true
         )
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
         scratch[:medication_statement_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_id_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementIdSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHOULD) Server returns valid results for MedicationStatement search by _id'
       description %(
@@ -16,30 +16,39 @@ _id on the MedicationStatement resource. This test
 will pass if resources are returned and match the search criteria. If
 none are returned, the test is skipped.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 
       )
 
       id :au_core_v200_medication_statement__id_search_test
       optional
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: ['_id'],
-          possible_status_search: true,
-          includes: [{ 'parameter' => 'MedicationStatement:medication', 'target_resource' => 'Medication', 'paths' => ['medicationReference'] }]
+          possible_status_search: true
         )
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
         scratch[:medication_statement_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_must_support_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../../must_support_test'
+require 'inferno_suite_generator/test_modules/must_support_test'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementMustSupportTest < Inferno::Test
-      include AUCoreTestKit::MustSupportTest
+      include InfernoSuiteGenerator::MustSupportTest
 
       title 'All must support elements are provided in the MedicationStatement resources returned'
       description %(
@@ -34,7 +34,7 @@ module AUCoreTestKit
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_patient_chain_search_test.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require_relative '../../../chained_search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/chained_search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementPatientChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for MedicationStatement search by patient (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier on the MedicationStatement resource. This test
 will pass if the server returns a success response to the request.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 )
 
       id :au_core_v200_medication_statement_patient_chain_search_test
@@ -27,7 +27,7 @@ will pass if the server returns a success response to the request.
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['subject']
@@ -35,7 +35,7 @@ will pass if the server returns a success response to the request.
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_patient_dva_chain_search_test.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require_relative '../../../chained_search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/chained_search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementPatient_DVA_ChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for MedicationStatement search by patient (DVA) (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier (DVA) on the MedicationStatement resource. This test
 will pass if the server returns a success response to the request.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/2.0.0/CapabilityStatement-au-core-server.html)
 )
 
       id :au_core_v200_medication_statement_patient_dva_chain_search_test
@@ -27,7 +27,7 @@ will pass if the server returns a success response to the request.
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['subject'],
@@ -36,7 +36,7 @@ will pass if the server returns a success response to the request.
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_patient_effective_search_test.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementPatientEffectiveSearchTest < Inferno::Test
-      include AUCoreTestKit::SearchTest
+      include InfernoSuiteGenerator::SearchTest
 
       title '(SHOULD) Server returns valid results for MedicationStatement search by patient + effective'
       description %(
@@ -16,7 +16,7 @@ patient + effective on the MedicationStatement resource. This test
 will pass if resources are returned and match the search criteria. If
 none are returned, the test is skipped.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/CapabilityStatement/au-core-responder)
 
       )
 
@@ -28,23 +28,32 @@ none are returned, the test is skipped.
             description: 'Comma separated list of patient IDs that in sum contain all MUST SUPPORT elements',
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
+      def self.demodata
+        @demodata ||= InfernoSuiteGenerator::Generator::IGDemodata.new(
+          YAML.load_file(File.join(File.dirname(__dir__), 'demodata.yml'), aliases: true)
+        )
+      end
+
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: %w[patient effective],
-          possible_status_search: true,
-          includes: [{ 'parameter' => 'MedicationStatement:medication', 'target_resource' => 'Medication', 'paths' => ['medicationReference'] }]
+          possible_status_search: true
         )
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources
         scratch[:medication_statement_resources] ||= {}
       end
 
+      def keep_all_search_results?
+        false
+      end
+
       run do
         run_search_test
       end

data/lib/au_core_test_kit/generated/v2.0.0/medication_statement/medication_statement_patient_ihi_chain_search_test.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require_relative '../../../chained_search_test'
-require_relative '../../../generator/group_metadata'
-require_relative '../../../helpers'
+require 'inferno_suite_generator/test_modules/chained_search_test'
+require 'inferno_suite_generator/core/group_metadata'
+require 'inferno_suite_generator/utils/helpers'
 
 module AUCoreTestKit
   module AUCoreV200
     class MedicationStatementPatient_IHI_ChainSearchTest < Inferno::Test
-      include AUCoreTestKit::ChainedSearchTest
+      include InfernoSuiteGenerator::ChainedSearchTest
 
       title '(SHOULD) Server returns valid results for MedicationStatement search by patient (IHI) (chained parameters)'
       description %(A server SHOULD support searching by
 patient:Patient.identifier (IHI) on the MedicationStatement resource. This test
 will pass if the server returns a success response to the request.
 
-[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core//CapabilityStatement-au-core-server.html)
+[AU Core Server CapabilityStatement](http://hl7.org.au/fhir/core/2.0.0/CapabilityStatement-au-core-server.html)
 )
 
       id :au_core_v200_medication_statement_patient_ihi_chain_search_test
@@ -27,7 +27,7 @@ will pass if the server returns a success response to the request.
             default: 'baratz-toni, irvine-ronny-lawrence, italia-sofia, howe-deangelo, hayes-arianne, baby-banks-john, banks-mia-leanne'
 
       def self.properties
-        @properties ||= SearchTestProperties.new(
+        @properties ||= InfernoSuiteGenerator::SearchTestProperties.new(
           resource_type: 'MedicationStatement',
           search_param_names: ['patient:Patient.identifier'],
           attr_paths: ['subject'],
@@ -36,7 +36,7 @@ will pass if the server returns a success response to the request.
       end
 
       def self.metadata
-        @metadata ||= Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
+        @metadata ||= InfernoSuiteGenerator::Generator::GroupMetadata.new(YAML.load_file(File.join(__dir__, 'metadata.yml'), aliases: true))
       end
 
       def scratch_resources